Adjust AOT CodeLense for Refresh metadata

Author: BoykoAlex

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

@@ -145,7 +145,7 @@ private List<CodeLens> createCodeLenses(IJavaProject project, MethodDeclaration
 			if (mb != null && hierarchyAnnot != null) {
 
 				Optional<DataRepositoryAotMetadata> optMetadata = getMetadata(repositoryMetadataService, project, mb);
-				optMetadata.ifPresent(metadata -> metadata.findMethod(mb).ifPresent(methodMetadata -> {
+				optMetadata.ifPresentOrElse(metadata -> metadata.findMethod(mb).ifPresent(methodMetadata -> {
 					boolean isQueryAnnotated = hierarchyAnnot.isAnnotatedWith(mb, Annotations.DATA_JPA_QUERY)
 							|| hierarchyAnnot.isAnnotatedWith(mb, Annotations.DATA_MONGODB_QUERY);
 
@@ -170,21 +170,28 @@ private List<CodeLens> createCodeLenses(IJavaProject project, MethodDeclaration
 							codeLenses.add(new CodeLens(range, queryTitle, null));
 						}
 					}
-				}));
+					
+					createRefreshCodeLens(project, "Refresh AOT Metadata", range).ifPresent(codeLenses::add);
+				}), () -> createRefreshCodeLens(project, "Show AOT-generated Implementation, Query, etc...", range)
+						.ifPresent(codeLenses::add)
+				);
 
-				if (ProjectBuild.MAVEN_PROJECT_TYPE.equals(project.getProjectBuild().getType())) {
-					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));
-				}
 
 			}
 		} catch (BadLocationException e) {
 			log.error("bad location while calculating code lens for data repository query method", e);
 		}
 		return codeLenses;
 	}
+	
+	private Optional<CodeLens> createRefreshCodeLens(IJavaProject project, String title, Range range) {
+		if (ProjectBuild.MAVEN_PROJECT_TYPE.equals(project.getProjectBuild().getType())) {
+			Command refreshCmd = repositoryMetadataService.regenerateMetadataCommand(project);
+			refreshCmd.setTitle(title);
+			return Optional.of(new CodeLens(range, refreshCmd, null));
+		}
+		return Optional.empty();
+	}
 
 	static FixDescriptor createFixDescriptor(IMethodBinding mb, String docUri, DataRepositoryModule module, IDataRepositoryAotMethodMetadata methodMetadata) {
 		return new FixDescriptor(AddAnnotationOverMethod.class.getName(), List.of(docUri), "Turn into `@Query`")

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

@@ -91,7 +91,7 @@ void noCodeLensOverMethodWithQueryAnnotation() throws Exception {
 		assertEquals(2, cls.size());
 		assertEquals("Implementation", cls.get(0).getCommand().getTitle());
 		assertEquals(1, cls.get(0).getCommand().getArguments().size());
-		assertEquals("Refresh", cls.get(1).getCommand().getTitle());
+		assertEquals("Refresh AOT Metadata", cls.get(1).getCommand().getTitle());
 		assertEquals(2, cls.get(1).getCommand().getArguments().size());
 	}
 }

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

@@ -103,7 +103,7 @@ void noCodeLensOverMethodWithQueryAnnotation() throws Exception {
 		assertEquals(2, cls.size());
 		assertEquals("Implementation", cls.get(0).getCommand().getTitle());
 		assertEquals(1, cls.get(0).getCommand().getArguments().size());
-		assertEquals("Refresh", cls.get(1).getCommand().getTitle());
+		assertEquals("Refresh AOT Metadata", cls.get(1).getCommand().getTitle());
 		assertEquals(2, cls.get(1).getCommand().getArguments().size());
 	}
 }

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

@@ -82,6 +82,10 @@ void generateMetadataCodeLens() throws Exception {
 		assertEquals(1,  cls.size());
 		Command cmd = cls.get(0).getCommand();
 		assertEquals("Show AOT-generated Implementation, Query, etc...", cmd.getTitle());
+		cls = editor.getCodeLenses("findAll", 1);
+		assertEquals(1,  cls.size());
+		cmd = cls.get(0).getCommand();
+		assertEquals("Show AOT-generated Implementation, Query, etc...", cmd.getTitle());
 
 		harness.getServer().getWorkspaceService().executeCommand(new ExecuteCommandParams(cmd.getCommand(), cmd.getArguments())).get();
 
@@ -97,7 +101,10 @@ void generateMetadataCodeLens() throws Exception {
 		assertEquals("Turn into @Query", cls.get(0).getCommand().getTitle());
 		assertEquals("Implementation", cls.get(1).getCommand().getTitle());
 		assertEquals("SELECT u FROM users u WHERE u.username = :username", cls.get(2).getCommand().getTitle());
-		assertEquals("Refresh", cls.get(3).getCommand().getTitle());
+		assertEquals("Refresh AOT Metadata", cls.get(3).getCommand().getTitle());
+
+		cls = editor.getCodeLenses("findAll", 1);
+		assertTrue(cls.isEmpty(), "Node CodeLens expected. Not even `Refresh AOT Metadata'");
 	}
 
 }

headless-services/spring-boot-language-server/src/test/resources/test-projects/data-repositories-jpa-4/src/main/java/example/springdata/aot/UserRepository.java

@@ -54,4 +54,6 @@ public interface UserRepository extends CrudRepository<User, String>, QuerydslPr
     @Query("SELECT u FROM example.springdata.aot.User u WHERE u.username LIKE ?1%")
     List<User> usersWithUsernamesStartingWith(String username);
 
+    List<User> findAll();
+
 }