Data JDBC query support

Signed-off-by: BoykoAlex <alex.boyko@broadcom.com>

Author: BoykoAlex

headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/semantic/tokens/SemanticTokenData.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2024 Broadcom, Inc.
+ * Copyright (c) 2024, 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
@@ -26,6 +26,10 @@ public SemanticTokenData(int start, int end, String type, String[] modifiers) {
 this(new Region(start, end -start), type, modifiers);
 }
 
+public static Builder builder(String type) {
+return new Builder().withType(type);
+}
+
 @Override
 public int compareTo(SemanticTokenData o) {
 if (range.getOffset() == o.range().getOffset()) {
@@ -64,4 +68,54 @@ public int getEnd() {
 return range.getEnd();
 }
 
+public static class Builder {
+int offset = 0;
+String text = "";
+String[] modifiers = new String[0];
+String type;
+
+public Builder withOffset(int offset) {
+this.offset = offset;
+return this;
+}
+
+public Builder withText(String text) {
+this.text = text;
+return this;
+}
+
+public Builder withType(String type) {
+this.type = type;
+return this;
+}
+
+public Builder withModifiers(String[] modifiers) {
+this.modifiers = modifiers;
+return this;
+}
+
+public Builder addOffset(int offset) {
+this.offset += offset;
+return this;
+}
+
+public Builder addOffset(String space) {
+this.offset += space.length();
+return this;
+}
+
+public Builder space() {
+this.offset++;
+return this;
+}
+
+public Builder withPrevious(SemanticTokenData previous) {
+return withOffset(previous.getEnd());
+}
+
+public SemanticTokenData build() {
+return new SemanticTokenData(new Region(offset, text.length()), type, modifiers);
+}
+
+}
 }

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

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2024 Broadcom, Inc.
+ * Copyright (c) 2024, 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
@@ -111,7 +111,8 @@ public List<SemanticTokenData> computeSemanticTokens(IJavaProject jp, EmbeddedLa
 
 @Override
 public boolean isApplicable(IJavaProject project) {
-return supportState.isEnabled() && (SpringProjectUtil.hasDependencyStartingWith(project, "spring-data-jpa", null) 
+return supportState.isEnabled() && (SpringProjectUtil.hasDependencyStartingWith(project, "spring-data-jpa", null)
+|| SpringProjectUtil.hasDependencyStartingWith(project, "spring-data-jdbc", null)
 || SpringProjectUtil.hasDependencyStartingWith(project, "jakarta.persistence-api", null)
 || SpringProjectUtil.hasDependencyStartingWith(project, "javax.persistence-api", null));
 }

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

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2024 Broadcom, Inc.
+ * Copyright (c) 2024, 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
@@ -79,10 +79,12 @@ public List<DocumentHighlight> getDocHighlights(IJavaProject project, TextDocume
 static Annotation findQueryAnnotation(AnnotationHierarchies annotationHierarchies, ASTNode node) {
 if (node.getParent() instanceof MemberValuePair pair
 && node.getParent().getParent() instanceof NormalAnnotation na && "value".equals(pair.getName().getIdentifier())
-&& JdtQueryVisitorUtils.isQueryAnnotation(annotationHierarchies, na)) {
+&& (JdtQueryVisitorUtils.isQueryAnnotation(annotationHierarchies, na)
+|| JdtQueryVisitorUtils.isQueryJdbcAnnotation(annotationHierarchies, na))) {
 return na;
 } else if (node.getParent() instanceof SingleMemberAnnotation sm
-&& JdtQueryVisitorUtils.isQueryAnnotation(annotationHierarchies, sm)) {
+&& (JdtQueryVisitorUtils.isQueryAnnotation(annotationHierarchies, sm)
+|| JdtQueryVisitorUtils.isQueryJdbcAnnotation(annotationHierarchies, sm))) {
 return sm;
 }
 return null;

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

@@ -32,7 +32,7 @@ public class JdtQueryVisitorUtils {
 public record EmbeddedQueryExpression(EmbeddedLanguageSnippet query, boolean isNative) {};
 
 public static EmbeddedQueryExpression extractQueryExpression(AnnotationHierarchies annotationHierarchies, SingleMemberAnnotation a) {
-if (isNativeQueryAnnotation(annotationHierarchies, a)) {
+if (isNativeQueryAnnotation(annotationHierarchies, a) || isQueryJdbcAnnotation(annotationHierarchies, a)) {
 EmbeddedLanguageSnippet expression = EmbeddedLangAstUtils.extractEmbeddedExpression(a.getValue());
 return expression == null ? null : new EmbeddedQueryExpression(expression, true);
 } else if (isQueryAnnotation(annotationHierarchies, a)) {
@@ -45,7 +45,7 @@ public static EmbeddedQueryExpression extractQueryExpression(AnnotationHierarchi
 public static EmbeddedQueryExpression extractQueryExpression(AnnotationHierarchies annotationHierarchies, NormalAnnotation a) {
 Expression queryExpression = null;
 boolean isNative = false;
-if (isNativeQueryAnnotation(annotationHierarchies, a)) {
+if (isNativeQueryAnnotation(annotationHierarchies, a) || isQueryJdbcAnnotation(annotationHierarchies, a)) {
 for (Object value : a.values()) {
 if (value instanceof MemberValuePair) {
 MemberValuePair pair = (MemberValuePair) value;
@@ -139,6 +139,13 @@ static boolean isNamedQueryAnnotation(AnnotationHierarchies annotationHierarchie
 return false;
 }
 
+static boolean isQueryJdbcAnnotation(AnnotationHierarchies annotationHierarchies, Annotation a) {
+if (Annotations.DATA_JDBC_QUERY.equals(a.getTypeName().getFullyQualifiedName()) || QUERY.equals(a.getTypeName().getFullyQualifiedName())) {
+return annotationHierarchies.isAnnotatedWith(a.resolveAnnotationBinding(), Annotations.DATA_JDBC_QUERY);
+}
+return false;
+}
+
 static boolean isNativeQueryAnnotation(AnnotationHierarchies annotationHierarchies, Annotation a) {
 if (NATIVE_QUERY.equals(a.getTypeName().getFullyQualifiedName()) || Annotations.DATA_JPA_NATIVE_QUERY.equals(a.getTypeName().getFullyQualifiedName())) {
 IAnnotationBinding type = a.resolveAnnotationBinding();

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

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2024 Broadcom, Inc.
+ * Copyright (c) 202, 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
@@ -83,8 +83,56 @@ public interface OwnerRepository {
 Editor editor = harness.newEditor(LanguageId.JAVA, source, Paths.get(jp.getLocationUri()).resolve("src/main/resource/my/package/OwnerRepository.java").toUri().toASCIIString());
 
 Range expectedRange = editor.rangeOf("String lastName", "lastName");
-Range highlightRange = editor.rangeOf(":1%", "1");
+Range highlightRange = editor.rangeOf(":1", "1");
 editor.assertGotoDefinition(highlightRange.getStart(), expectedRange, highlightRange);
 
 }
+
+@Test
+void parameterNameDefinitionJdbc() throws Exception {
+String source = """
+package my.package
+
+import org.springframework.data.jdbc.repository.query.Query;
+import org.springframework.data.repository.query.Param;
+
+public interface EmployeeRepository {
+
+@Query("SELECT * FROM owner WHERE last_name LIKE concat(:lastName,'%')")
+void findByLastName(@Param("lastName") String lastName);
+}
+""";
+
+Editor editor = harness.newEditor(LanguageId.JAVA, source, Paths.get(jp.getLocationUri()).resolve("src/main/resource/my/package/EmployeeRepository.java").toUri().toASCIIString());
+
+Range expectedRange = editor.rangeOf("String lastName", "lastName");
+Range highlightRange = editor.rangeOf(":lastName", "lastName");
+editor.assertGotoDefinition(highlightRange.getStart(), expectedRange, highlightRange);
+
+}
+
+@Test
+void parameterOrdinalDefinitionJdbc() throws Exception {
+String source = """
+package my.package
+
+import org.springframework.data.jdbc.repository.query.Query;
+import org.springframework.data.repository.query.Param;
+
+public interface EmployeeRepository {
+
+@Query("SELECT * FROM owner WHERE last_name LIKE concat(?1,'%')")
+void findByLastName(@Param("lastName") String lastName);
+}
+""";
+
+Editor editor = harness.newEditor(LanguageId.JAVA, source, Paths.get(jp.getLocationUri()).resolve("src/main/resource/my/package/EmployeeRepository.java").toUri().toASCIIString());
+
+Range expectedRange = editor.rangeOf("String lastName", "lastName");
+Range highlightRange = editor.rangeOf("?1", "1");
+editor.assertGotoDefinition(highlightRange.getStart(), expectedRange, highlightRange);
+
+}
+
+
 }