Polish abd bit of fixing

Signed-off-by: BoykoAlex <[email protected]>

Author: BoykoAlex

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

@@ -236,8 +236,7 @@ public class JdtConfig {
 		switch(LspClient.currentClient()) {
 		case VSCODE:
 		case THEIA:
-			return new DefaultBuildCommandProvider(server);
-//			return new VSCodeBuildCommandProvider();
+			return new VSCodeBuildCommandProvider();
 		case ECLIPSE:
 			return new VSCodeBuildCommandProvider();
 		default:

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

@@ -10,6 +10,7 @@
  *******************************************************************************/
 package org.springframework.ide.vscode.boot.java.data;
 
+import java.util.Objects;
 import java.util.Optional;
 
 import org.eclipse.jdt.core.dom.IMethodBinding;
@@ -20,23 +21,25 @@
 public record DataRepositoryAotMetadata (String name, String type, DataRepositoryModule module, IDataRepositoryAotMethodMetadata[] methods) {
 
 	public Optional<IDataRepositoryAotMethodMetadata> findMethod(IMethodBinding method) {
-		String name = method.getName();
+		String methodName = method.getName();
 
-		for (IDataRepositoryAotMethodMetadata methodMetadata : methods()) {
-			
-			if (methodMetadata.getName() != null && methodMetadata.getName().equals(name)) {
-
-				String signature = methodMetadata.getSignature();
-				JLRMethod parsedMethodSignature = JLRMethodParser.parse(signature);
+		if (methodName != null) {
+			for (IDataRepositoryAotMethodMetadata methodMetadata : methods()) {
 
-				if (parsedMethodSignature.getFQClassName().equals(name())
-						&& parsedMethodSignature.getMethodName().equals(method.getName())
-						&& parsedMethodSignature.getReturnType().equals(method.getReturnType().getQualifiedName())
-						&& parameterMatches(parsedMethodSignature, method)) {
-					return Optional.of(methodMetadata);
+				if (methodMetadata.getName() != null && methodMetadata.getName().equals(methodName)) {
+
+					String signature = methodMetadata.getSignature();
+					JLRMethod parsedMethodSignature = JLRMethodParser.parse(signature);
+									
+					if (Objects.equals(name(), parsedMethodSignature.getFQClassName())
+							&& methodName.equals(parsedMethodSignature.getMethodName())
+							&& Objects.equals(parsedMethodSignature.getReturnType(), method.getReturnType().getQualifiedName())
+							&& parameterMatches(parsedMethodSignature, method)) {
+						return Optional.of(methodMetadata);
+					}
 				}
 			}
-		}
+		}		
 
 		return Optional.empty();
 	}

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

@@ -144,7 +144,8 @@ private List<CodeLens> createCodeLenses(IJavaProject project, MethodDeclaration
 
 			if (mb != null && hierarchyAnnot != null) {
 
-				getMetadata(repositoryMetadataService, project, mb).ifPresent(metadata -> metadata.findMethod(mb).ifPresent(methodMetadata -> {
+				Optional<DataRepositoryAotMetadata> optMetadata = getMetadata(repositoryMetadataService, project, mb);
+				optMetadata.ifPresent(metadata -> metadata.findMethod(mb).ifPresent(methodMetadata -> {
 					boolean isQueryAnnotated = hierarchyAnnot.isAnnotatedWith(mb, Annotations.DATA_JPA_QUERY)
 							|| hierarchyAnnot.isAnnotatedWith(mb, Annotations.DATA_MONGODB_QUERY);
 
@@ -172,7 +173,7 @@ private List<CodeLens> createCodeLenses(IJavaProject project, MethodDeclaration
 				}));
 
 				if (ProjectBuild.MAVEN_PROJECT_TYPE.equals(project.getProjectBuild().getType())) {
-					String refreshCmdTitle = codeLenses.isEmpty() ? "Show AOT-generated Implementation, Query, etc..." : "Refresh";
+					String refreshCmdTitle = optMetadata.map(m -> "Refresh").orElse("Show AOT-generated Implementation, Query, etc...");
 					Command refreshCmd = repositoryMetadataService.regenerateMetadataCommand(project);
 					refreshCmd.setTitle(refreshCmdTitle);
 					codeLenses.add(new CodeLens(range, refreshCmd, null));