refactored annotation attribute completion proecessors to allow more …

…specific proposals to be created
spring-projects · Oct 24, 2024 · 4aeaf05 · 4aeaf05
1 parent 54df530
commit 4aeaf05
Show file tree

Hide file tree

Showing 17 changed files with 177 additions and 128 deletions.
diff --git a/...ingframework/ide/vscode/boot/java/annotations/AnnotationAttributeCompletionProcessor.java b/...ingframework/ide/vscode/boot/java/annotations/AnnotationAttributeCompletionProcessor.java
@@ -12,7 +12,6 @@
 
 import java.util.Collection;
 import java.util.HashSet;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -134,21 +133,22 @@ private void createCompletionProposals(IJavaProject project, TextDocument doc, A
 		AnnotationAttributeCompletionProvider completionProvider = this.completionProviders.get(attributeName);
 		if (completionProvider != null) {
 
-			Map<String, String> proposals = completionProvider.getCompletionCandidates(project, node);
-			Map<String, String> filteredProposals = proposals.entrySet().stream()
-					.filter(candidate -> candidate.getKey().toLowerCase().contains(filterPrefix.toLowerCase()))
-					.filter(candidate -> !alreadyMentionedValues.contains(candidate.getKey()))
-					.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (u, v) -> u, LinkedHashMap::new));
+			List<AnnotationAttributeProposal> proposals = completionProvider.getCompletionCandidates(project, node);
+
+			List<AnnotationAttributeProposal> filteredProposals = proposals.stream()
+					.filter(proposal -> proposal.getLabel().toLowerCase().contains(filterPrefix.toLowerCase()))
+					.filter(proposal -> !alreadyMentionedValues.contains(proposal.getLabel()))
+					.collect(Collectors.toList());
+
 			double score = filteredProposals.size();
-			for (Map.Entry<String, String> entry : filteredProposals.entrySet()) {
-				String candidate = entry.getKey();
+			for (AnnotationAttributeProposal candidate : filteredProposals) {
 				DocumentEdits edits = new DocumentEdits(doc, false);
-				edits.replace(startOffset, endOffset, createReplacementText.apply(candidate));
+				edits.replace(startOffset, endOffset, createReplacementText.apply(candidate.getLabel()));
 
 				AnnotationAttributeCompletionProposal proposal = new AnnotationAttributeCompletionProposal(edits,
-						candidate, entry.getValue(), null, score--);
-				completions.add(proposal);
+						candidate, null, score--);
 
+				completions.add(proposal);
 			}
 		}
 	}

diff --git a/...ringframework/ide/vscode/boot/java/annotations/AnnotationAttributeCompletionProposal.java b/...ringframework/ide/vscode/boot/java/annotations/AnnotationAttributeCompletionProposal.java
@@ -20,25 +20,26 @@
  */
 public class AnnotationAttributeCompletionProposal extends ScoreableProposal {
 
-	private static final String EMPTY_DETAIL = "";
+	private final AnnotationAttributeProposal coreProposal;
 
 	private final DocumentEdits edits;
-	private final String label;
-	private final String detail;
 	private final Renderable documentation;
 	private final double score;
 
-	public AnnotationAttributeCompletionProposal(DocumentEdits edits, String label, String detail, Renderable documentation, double score) {
+	public AnnotationAttributeCompletionProposal(DocumentEdits edits, AnnotationAttributeProposal coreProposal, Renderable documentation, double score) {
 		this.edits = edits;
-		this.label = label;
-		this.detail = detail == null ? EMPTY_DETAIL : detail;
+		this.coreProposal = coreProposal;
 		this.documentation = documentation;
 		this.score = score;
 	}
 
+//	public AnnotationAttributeCompletionProposal(DocumentEdits edits, String label, String detail, Renderable documentation, double score) {
+//		this(edits, new AnnotationAttributeProposal(label, detail), documentation, score);
+//	}
+
 	@Override
 	public String getLabel() {
-		return this.label;
+		return this.coreProposal.getLabel();
 	}
 
 	@Override
@@ -53,7 +54,7 @@ public DocumentEdits getTextEdit() {
 
 	@Override
 	public String getDetail() {
-		return this.detail;
+		return this.coreProposal.getDetail();
 	}
 
 	@Override

diff --git a/...ringframework/ide/vscode/boot/java/annotations/AnnotationAttributeCompletionProvider.java b/...ringframework/ide/vscode/boot/java/annotations/AnnotationAttributeCompletionProvider.java
@@ -10,13 +10,13 @@
  *******************************************************************************/
 package org.springframework.ide.vscode.boot.java.annotations;
 
-import java.util.Map;
+import java.util.List;
 
 import org.eclipse.jdt.core.dom.ASTNode;
 import org.springframework.ide.vscode.commons.java.IJavaProject;
 
 public interface AnnotationAttributeCompletionProvider {
 
-	Map<String, String> getCompletionCandidates(IJavaProject project, ASTNode node);
+	List<AnnotationAttributeProposal> getCompletionCandidates(IJavaProject project, ASTNode node);
 
 }
diff --git a/...ava/org/springframework/ide/vscode/boot/java/annotations/AnnotationAttributeProposal.java b/...ava/org/springframework/ide/vscode/boot/java/annotations/AnnotationAttributeProposal.java
@@ -0,0 +1,50 @@
+/*******************************************************************************
+ * 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.annotations;
+
+/**
+ * @author Martin Lippert
+ */
+public class AnnotationAttributeProposal {
+
+	private static final String EMPTY_DETAIL = "";
+
+	private final String filterText;
+	private final String label;
+	private final String detail;
+
+	public AnnotationAttributeProposal(String label) {
+		this(label, label, label);
+	}
+
+	public AnnotationAttributeProposal(String label, String detail) {
+		this(label, detail, label);
+	}
+
+	public AnnotationAttributeProposal(String label, String detail, String filterText) {
+		this.label = label;
+		this.detail = detail == null ? EMPTY_DETAIL : detail;
+		this.filterText = filterText;
+	}
+
+	public String getLabel() {
+		return label;
+	}
+
+	public String getDetail() {
+		return detail;
+	}
+
+	public String getFilterText() {
+		return filterText;
+	}
+
+}
diff --git a/...ain/java/org/springframework/ide/vscode/boot/java/beans/BeanNamesCompletionProcessor.java b/...ain/java/org/springframework/ide/vscode/boot/java/beans/BeanNamesCompletionProcessor.java
@@ -11,13 +11,13 @@
 package org.springframework.ide.vscode.boot.java.beans;
 
 import java.util.Arrays;
-import java.util.LinkedHashMap;
-import java.util.Map;
+import java.util.List;
 import java.util.stream.Collectors;
 
 import org.eclipse.jdt.core.dom.ASTNode;
 import org.springframework.ide.vscode.boot.index.SpringMetamodelIndex;
 import org.springframework.ide.vscode.boot.java.annotations.AnnotationAttributeCompletionProvider;
+import org.springframework.ide.vscode.boot.java.annotations.AnnotationAttributeProposal;
 import org.springframework.ide.vscode.commons.java.IJavaProject;
 import org.springframework.ide.vscode.commons.protocol.spring.Bean;
 
@@ -33,11 +33,12 @@ public BeanNamesCompletionProcessor(SpringMetamodelIndex springIndex) {
     }
 
     @Override
-    public Map<String, String> getCompletionCandidates(IJavaProject project, ASTNode node) {
+    public List<AnnotationAttributeProposal> getCompletionCandidates(IJavaProject project, ASTNode node) {
         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));
+                .map(beanName -> new AnnotationAttributeProposal(beanName))
+                .collect(Collectors.toList());
     }
 }
diff --git a/...ain/java/org/springframework/ide/vscode/boot/java/beans/BeanTypesCompletionProcessor.java b/...ain/java/org/springframework/ide/vscode/boot/java/beans/BeanTypesCompletionProcessor.java
@@ -10,17 +10,17 @@
  *******************************************************************************/
 package org.springframework.ide.vscode.boot.java.beans;
 
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
 import org.eclipse.jdt.core.dom.ASTNode;
 import org.springframework.ide.vscode.boot.index.SpringMetamodelIndex;
 import org.springframework.ide.vscode.boot.java.annotations.AnnotationAttributeCompletionProvider;
+import org.springframework.ide.vscode.boot.java.annotations.AnnotationAttributeProposal;
 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
  */
@@ -33,11 +33,12 @@ public BeanTypesCompletionProcessor(SpringMetamodelIndex springIndex) {
     }
 
     @Override
-    public Map<String, String> getCompletionCandidates(IJavaProject project, ASTNode node) {
+    public List<AnnotationAttributeProposal> getCompletionCandidates(IJavaProject project, ASTNode node) {
         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));
+                .map(beanType -> new AnnotationAttributeProposal(beanType))
+                .collect(Collectors.toList());
     }
 }
diff --git a/...ain/java/org/springframework/ide/vscode/boot/java/beans/DependsOnCompletionProcessor.java b/...ain/java/org/springframework/ide/vscode/boot/java/beans/DependsOnCompletionProcessor.java
@@ -11,13 +11,13 @@
 package org.springframework.ide.vscode.boot.java.beans;
 
 import java.util.Arrays;
-import java.util.LinkedHashMap;
-import java.util.Map;
+import java.util.List;
 import java.util.stream.Collectors;
 
 import org.eclipse.jdt.core.dom.ASTNode;
 import org.springframework.ide.vscode.boot.index.SpringMetamodelIndex;
 import org.springframework.ide.vscode.boot.java.annotations.AnnotationAttributeCompletionProvider;
+import org.springframework.ide.vscode.boot.java.annotations.AnnotationAttributeProposal;
 import org.springframework.ide.vscode.commons.java.IJavaProject;
 
 /**
@@ -238,11 +238,12 @@ public DependsOnCompletionProcessor(SpringMetamodelIndex springIndex) {
 //	}
 
 	@Override
-	public Map<String, String> getCompletionCandidates(IJavaProject project, ASTNode node) {
+	public List<AnnotationAttributeProposal> getCompletionCandidates(IJavaProject project, ASTNode node) {
 		return Arrays.stream(this.springIndex.getBeansOfProject(project.getElementName()))
 				.map(bean -> bean.getName())
 				.distinct()
-				.collect(Collectors.toMap(key -> key, value -> value, (u, v) -> u, LinkedHashMap::new));
+				.map(beanName -> new AnnotationAttributeProposal(beanName))
+				.collect(Collectors.toList());
 	}
 
 

diff --git a/...src/main/java/org/springframework/ide/vscode/boot/java/beans/NamedCompletionProvider.java b/...src/main/java/org/springframework/ide/vscode/boot/java/beans/NamedCompletionProvider.java
@@ -11,15 +11,15 @@
 package org.springframework.ide.vscode.boot.java.beans;
 
 import java.util.Arrays;
-import java.util.LinkedHashMap;
-import java.util.Map;
+import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import org.eclipse.jdt.core.dom.ASTNode;
 import org.springframework.ide.vscode.boot.index.SpringMetamodelIndex;
 import org.springframework.ide.vscode.boot.java.Annotations;
 import org.springframework.ide.vscode.boot.java.annotations.AnnotationAttributeCompletionProvider;
+import org.springframework.ide.vscode.boot.java.annotations.AnnotationAttributeProposal;
 import org.springframework.ide.vscode.commons.java.IJavaProject;
 import org.springframework.ide.vscode.commons.protocol.spring.Bean;
 
@@ -35,15 +35,16 @@ public NamedCompletionProvider(SpringMetamodelIndex springIndex) {
 	}
 
 	@Override
-	public Map<String, String> getCompletionCandidates(IJavaProject project, ASTNode node) {
+	public List<AnnotationAttributeProposal> getCompletionCandidates(IJavaProject project, ASTNode node) {
 
 		Bean[] beans = this.springIndex.getBeansOfProject(project.getElementName());
 
 		return Stream.concat(
 				findAllNamedValues(beans),
 				Arrays.stream(beans).map(bean -> bean.getName()))
 				.distinct()
-				.collect(Collectors.toMap(key -> key, value -> value, (u, v) -> u, LinkedHashMap::new));
+				.map(beanName -> new AnnotationAttributeProposal(beanName))
+				.collect(Collectors.toList());
 	}
 
 	private Stream<String> findAllNamedValues(Bean[] beans) {

diff --git a/...c/main/java/org/springframework/ide/vscode/boot/java/beans/ProfileCompletionProvider.java b/...c/main/java/org/springframework/ide/vscode/boot/java/beans/ProfileCompletionProvider.java
@@ -11,15 +11,15 @@
 package org.springframework.ide.vscode.boot.java.beans;
 
 import java.util.Arrays;
-import java.util.LinkedHashMap;
-import java.util.Map;
+import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import org.eclipse.jdt.core.dom.ASTNode;
 import org.springframework.ide.vscode.boot.index.SpringMetamodelIndex;
 import org.springframework.ide.vscode.boot.java.Annotations;
 import org.springframework.ide.vscode.boot.java.annotations.AnnotationAttributeCompletionProvider;
+import org.springframework.ide.vscode.boot.java.annotations.AnnotationAttributeProposal;
 import org.springframework.ide.vscode.commons.java.IJavaProject;
 import org.springframework.ide.vscode.commons.protocol.spring.Bean;
 
@@ -35,13 +35,14 @@ public ProfileCompletionProvider(SpringMetamodelIndex springIndex) {
 	}
 
 	@Override
-	public Map<String, String> getCompletionCandidates(IJavaProject project, ASTNode node) {
+	public List<AnnotationAttributeProposal> getCompletionCandidates(IJavaProject project, ASTNode node) {
 
 		Bean[] beans = this.springIndex.getBeansOfProject(project.getElementName());
 
 		return findAllProfiles(beans)
 				.distinct()
-				.collect(Collectors.toMap(key -> key, value -> value, (u, v) -> u, LinkedHashMap::new));
+				.map(profile -> new AnnotationAttributeProposal(profile))
+				.collect(Collectors.toList());
 	}
 
 	private Stream<String> findAllProfiles(Bean[] beans) {

diff --git a/...main/java/org/springframework/ide/vscode/boot/java/beans/QualifierCompletionProvider.java b/...main/java/org/springframework/ide/vscode/boot/java/beans/QualifierCompletionProvider.java
@@ -11,9 +11,7 @@
 package org.springframework.ide.vscode.boot.java.beans;
 
 import java.util.Arrays;
-import java.util.LinkedHashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -25,6 +23,7 @@
 import org.springframework.ide.vscode.boot.index.SpringMetamodelIndex;
 import org.springframework.ide.vscode.boot.java.Annotations;
 import org.springframework.ide.vscode.boot.java.annotations.AnnotationAttributeCompletionProvider;
+import org.springframework.ide.vscode.boot.java.annotations.AnnotationAttributeProposal;
 import org.springframework.ide.vscode.commons.java.IJavaProject;
 import org.springframework.ide.vscode.commons.protocol.spring.Bean;
 
@@ -40,7 +39,7 @@ public QualifierCompletionProvider(SpringMetamodelIndex springIndex) {
 	}
 
 	@Override
-	public Map<String, String> getCompletionCandidates(IJavaProject project, ASTNode node) {
+	public List<AnnotationAttributeProposal> getCompletionCandidates(IJavaProject project, ASTNode node) {
 
 		Bean[] beans = this.springIndex.getBeansOfProject(project.getElementName());
 
@@ -54,7 +53,8 @@ public Map<String, String> getCompletionCandidates(IJavaProject project, ASTNode
 
 		return candidates
 				.distinct()
-				.collect(Collectors.toMap(key -> key, value -> value, (u, v) -> u, LinkedHashMap::new));
+				.map(qualifier -> new AnnotationAttributeProposal(qualifier))
+				.collect(Collectors.toList());
 	}
 
 	private Stream<String> findAllQualifiers(Bean[] beans) {

diff --git a/.../main/java/org/springframework/ide/vscode/boot/java/beans/ResourceCompletionProvider.java b/.../main/java/org/springframework/ide/vscode/boot/java/beans/ResourceCompletionProvider.java
@@ -11,13 +11,13 @@
 package org.springframework.ide.vscode.boot.java.beans;
 
 import java.util.Arrays;
-import java.util.LinkedHashMap;
-import java.util.Map;
+import java.util.List;
 import java.util.stream.Collectors;
 
 import org.eclipse.jdt.core.dom.ASTNode;
 import org.springframework.ide.vscode.boot.index.SpringMetamodelIndex;
 import org.springframework.ide.vscode.boot.java.annotations.AnnotationAttributeCompletionProvider;
+import org.springframework.ide.vscode.boot.java.annotations.AnnotationAttributeProposal;
 import org.springframework.ide.vscode.commons.java.IJavaProject;
 import org.springframework.ide.vscode.commons.protocol.spring.Bean;
 
@@ -33,13 +33,14 @@ public ResourceCompletionProvider(SpringMetamodelIndex springIndex) {
 	}
 
 	@Override
-	public Map<String, String> getCompletionCandidates(IJavaProject project, ASTNode node) {
+	public List<AnnotationAttributeProposal> getCompletionCandidates(IJavaProject project, ASTNode node) {
 
 		Bean[] beans = this.springIndex.getBeansOfProject(project.getElementName());
 
 		return Arrays.stream(beans).map(bean -> bean.getName())
 				.distinct()
-				.collect(Collectors.toMap(key -> key, value -> value, (u, v) -> u, LinkedHashMap::new));
+				.map(beanName -> new AnnotationAttributeProposal(beanName))
+				.collect(Collectors.toList());
 	}
 
 }