GH-1724: added support for spring data jdbc AOT repositories

Author: martinlippert

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

@@ -52,6 +52,7 @@ public class Annotations {
 	public static final String DATA_JPA_NATIVE_QUERY = "org.springframework.data.jpa.repository.NativeQuery";
 	public static final String DATA_MONGODB_QUERY = "org.springframework.data.mongodb.repository.Query";
 	public static final String DATA_REST_BASE_PATH_AWARE_CONTROLLER = "org.springframework.data.rest.webmvc.BasePathAwareController";
+	public static final String DATA_JDBC_QUERY = "org.springframework.data.jdbc.repository.query.Query";
 
 	public static final String AUTOWIRED = "org.springframework.beans.factory.annotation.Autowired";
 	public static final String QUALIFIER = "org.springframework.beans.factory.annotation.Qualifier";

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

@@ -51,6 +51,12 @@
 public class DataRepositoryAotMetadataCodeLensProvider implements CodeLensProvider {
 
 	private static final String COVERT_TO_QUERY_LABEL = "Turn into @Query";
+	
+	private static final Map<DataRepositoryModule, String> moduleToQueryMapping = Map.of(
+			DataRepositoryModule.JPA, Annotations.DATA_JPA_QUERY,
+			DataRepositoryModule.JDBC, Annotations.DATA_JDBC_QUERY,
+			DataRepositoryModule.MONGODB, Annotations.DATA_MONGODB_QUERY
+	);
 
 	private static final Logger log = LoggerFactory.getLogger(DataRepositoryAotMetadataCodeLensProvider.class);
 
@@ -146,7 +152,8 @@ private List<CodeLens> createCodeLenses(IJavaProject project, MethodDeclaration
 				Optional<DataRepositoryAotMetadata> optMetadata = getMetadata(repositoryMetadataService, project, mb);
 				optMetadata.ifPresentOrElse(metadata -> metadata.findMethod(mb).ifPresent(methodMetadata -> {
 					boolean isQueryAnnotated = hierarchyAnnot.isAnnotatedWith(mb, Annotations.DATA_JPA_QUERY)
-							|| hierarchyAnnot.isAnnotatedWith(mb, Annotations.DATA_MONGODB_QUERY);
+							|| hierarchyAnnot.isAnnotatedWith(mb, Annotations.DATA_MONGODB_QUERY)
+							|| hierarchyAnnot.isAnnotatedWith(mb, Annotations.DATA_JDBC_QUERY);
 
 					if (!isQueryAnnotated) {
 						codeLenses.add(new CodeLens(range, refactorings.createFixCommand(COVERT_TO_QUERY_LABEL, createFixDescriptor(mb, document.getUri(), metadata.module(), methodMetadata)), null));
@@ -196,7 +203,7 @@ static FixDescriptor createFixDescriptor(IMethodBinding mb, String docUri, DataR
 				.withRecipeScope(RecipeScope.FILE)
 
 				.withParameters(Map.of(
-						"annotationType", module == DataRepositoryModule.JPA ? Annotations.DATA_JPA_QUERY : Annotations.DATA_MONGODB_QUERY,
+						"annotationType", moduleToQueryMapping.get(module),
 						"method", "%s %s(%s)".formatted(mb.getDeclaringClass().getQualifiedName(), mb.getName(),
 								Arrays.stream(mb.getParameterTypes())
 									.map(pt -> pt.getQualifiedName())
@@ -214,5 +221,5 @@ private static List<AddAnnotationOverMethod.Attribute> createAttributeList(Map<S
 
 		return result;
 	}
-
+	
 }

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

@@ -89,6 +89,8 @@ public DataRepositoryAotMetadata deserialize(JsonElement json, Type typeOfT,
 					return new DataRepositoryAotMetadata(name, type, moduleType, context.deserialize(o.get(METHODS), MongoAotMethodMetadata[].class));
 				case JPA:
 					return new DataRepositoryAotMetadata(name, type, moduleType, context.deserialize(o.get(METHODS), JpaAotMethodMetadata[].class));
+				case JDBC:
+					return new DataRepositoryAotMetadata(name, type, moduleType, context.deserialize(o.get(METHODS), JdbcAotMethodMetadata[].class));
 				}
 			}
 			return null;
@@ -157,7 +159,7 @@ private Optional<DataRepositoryAotMetadata> readMetadataFile(Path filePath) {
 		if (Files.isRegularFile(filePath)) {
 			try (BufferedReader reader = Files.newBufferedReader(filePath)) {
 				return Optional.ofNullable(gson.fromJson(reader, DataRepositoryAotMetadata.class));
-			} catch (IOException e) {
+			} catch (Exception e) {
 				log.error("Failed to read metadata file: {}", filePath, e);
 			}
 		}

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

@@ -13,6 +13,7 @@
 public enum DataRepositoryModule {
 
 	JPA,
-	MONGODB
+	MONGODB,
+	JDBC
 
 }

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

@@ -0,0 +1,36 @@
+/*******************************************************************************
+ * Copyright (c) 2025 Broadcom, 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:
+ *     Broadcom, Inc. - initial API and implementation
+ *******************************************************************************/
+package org.springframework.ide.vscode.boot.java.data;
+
+import java.util.Map;
+
+class JdbcAotMethodMetadata extends AbstractDataRepositoryAotMethodMetadata {
+	
+	record Query(String query) {}
+	
+	private Query query;
+
+	public JdbcAotMethodMetadata(String name, String signature, Query query) {
+		super(name, signature);
+		this.query = query;
+	}
+
+	@Override
+	public String getQueryStatement() {
+		return query == null ? null : query.query();
+	}
+
+	@Override
+	public Map<String, String> getAttributesMap() {
+		 return Map.of("value", getQueryStatement());
+	}
+
+}

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

@@ -50,8 +50,10 @@ public boolean isApplicable(IJavaProject project) {
 	static boolean isValidProject(IJavaProject project) {
 		Version springDataJpaVersion = SpringProjectUtil.getDependencyVersion(project, "spring-data-jpa");
 		Version springDataMongoDbVersion = SpringProjectUtil.getDependencyVersion(project, "spring-data-mongodb");
+		Version springDataJddbcVersion = SpringProjectUtil.getDependencyVersion(project, "spring-data-jdbc");
 		return (springDataJpaVersion != null && springDataJpaVersion.getMajor() >= 4)
-				|| (springDataMongoDbVersion != null && springDataMongoDbVersion.getMajor() >= 5);
+				|| (springDataMongoDbVersion != null && springDataMongoDbVersion.getMajor() >= 5)
+				|| (springDataJddbcVersion != null && springDataJddbcVersion.getMajor() >= 4);
 	}
 
 	@Override