Polish and tests

Author: BoykoAlex

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

@@ -39,6 +39,7 @@
 import org.springframework.ide.vscode.parser.postgresql.PostgreSqlQueryFormatter;
 import org.springframework.ide.vscode.boot.java.jdt.refactoring.AddQueryAnnotationRefactoring;
 import org.springframework.ide.vscode.boot.java.jdt.refactoring.JdtFixDescriptor;
+import org.springframework.ide.vscode.boot.java.jdt.refactoring.JdtRefactorUtils;
 import org.springframework.ide.vscode.boot.java.jdt.refactoring.JdtRefactorings;
 import org.springframework.ide.vscode.boot.java.utils.ASTUtils;
 import org.springframework.ide.vscode.commons.java.IJavaProject;
@@ -234,7 +235,7 @@ private static List<AddQueryAnnotationRefactoring.Attribute> createAttributeList
 						}
 					}
 				};
-				value = "\"\"\"\n" + formattedValue + "\n\"\"\"";
+				value = "\"\"\"\n" + JdtRefactorUtils.escapeForTextBlock(formattedValue) + "\n\"\"\"";
 			} else {
 				value = "\"" + StringEscapeUtils.escapeJava(value).trim() + "\"";
 			}
@@ -243,5 +244,6 @@ private static List<AddQueryAnnotationRefactoring.Attribute> createAttributeList
 		}
 		return result;
 	}
+
 }
 

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

@@ -87,13 +87,16 @@ public void apply(ASTRewrite rewrite, CompilationUnit cu) {
 		} else if (existing instanceof NormalAnnotation normalAnnotation) {
 			addMissingAttributes(rewrite, ast, normalAnnotation);
 		} else if (existing instanceof SingleMemberAnnotation singleMember) {
-			replaceSingleMemberWithNormal(rewrite, ast, singleMember);
+			boolean hasNonValueAttributes = attributes.stream().anyMatch(a -> !"value".equals(a.name()));
+			if (hasNonValueAttributes) {
+				replaceSingleMemberWithNormal(rewrite, ast, singleMember);
+			}
 		} else if (existing instanceof MarkerAnnotation marker && !attributes.isEmpty()) {
 			rewrite.replace(marker, buildAnnotation(ast, attributes), null);
 		}
 
 		JdtRefactorUtils.addImport(rewrite, ast, cu,
-				new ClassType(extractPackageName(annotationFqn), extractSimpleName(annotationFqn)));
+				new ClassType(JdtRefactorUtils.extractPackageName(annotationFqn), JdtRefactorUtils.extractSimpleName(annotationFqn)));
 	}
 
 	private void addMissingAttributes(ASTRewrite rewrite, AST ast, NormalAnnotation annotation) {
@@ -116,7 +119,7 @@ private void replaceSingleMemberWithNormal(ASTRewrite rewrite, AST ast, SingleMe
 		Expression existingValue = singleMember.getValue();
 
 		NormalAnnotation replacement = ast.newNormalAnnotation();
-		replacement.setTypeName(ast.newSimpleName(extractSimpleName(annotationFqn)));
+		replacement.setTypeName(ast.newSimpleName(JdtRefactorUtils.extractSimpleName(annotationFqn)));
 
 		@SuppressWarnings("unchecked")
 		List<MemberValuePair> values = replacement.values();
@@ -182,7 +185,7 @@ private boolean matches(MethodDeclaration node) {
 	}
 
 	private Annotation findAnnotation(MethodDeclaration node) {
-		String simpleName = extractSimpleName(annotationFqn);
+		String simpleName = JdtRefactorUtils.extractSimpleName(annotationFqn);
 		for (Object mod : node.modifiers()) {
 			if (mod instanceof Annotation a) {
 				String name = a.getTypeName().getFullyQualifiedName();
@@ -196,7 +199,7 @@ private Annotation findAnnotation(MethodDeclaration node) {
 
 	@SuppressWarnings("unchecked")
 	private Annotation buildAnnotation(AST ast, List<Attribute> attrs) {
-		String simpleName = extractSimpleName(annotationFqn);
+		String simpleName = JdtRefactorUtils.extractSimpleName(annotationFqn);
 
 		if (attrs.size() == 1 && "value".equals(attrs.get(0).name())) {
 			SingleMemberAnnotation sma = ast.newSingleMemberAnnotation();
@@ -237,14 +240,4 @@ private Expression buildValue(AST ast, Attribute attr) {
 		return sl;
 	}
 
-	private static String extractSimpleName(String fqn) {
-		int lastDot = fqn.lastIndexOf('.');
-		return lastDot >= 0 ? fqn.substring(lastDot + 1) : fqn;
-	}
-
-	private static String extractPackageName(String fqn) {
-		int lastDot = fqn.lastIndexOf('.');
-		return lastDot >= 0 ? fqn.substring(0, lastDot) : "";
-	}
-
 }

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

@@ -159,4 +159,38 @@ else if (jdtEdit instanceof DeleteEdit de) {
 		}
 	}
 
+	/**
+	 * Returns the simple class name from a fully qualified name.
+	 * For example, {@code "org.example.Foo"} → {@code "Foo"}.
+	 */
+	public static String extractSimpleName(String fqn) {
+		int lastDot = fqn.lastIndexOf('.');
+		return lastDot >= 0 ? fqn.substring(lastDot + 1) : fqn;
+	}
+
+	/**
+	 * Returns the package name from a fully qualified name.
+	 * For example, {@code "org.example.Foo"} → {@code "org.example"}.
+	 * Returns an empty string for default-package types.
+	 */
+	public static String extractPackageName(String fqn) {
+		int lastDot = fqn.lastIndexOf('.');
+		return lastDot >= 0 ? fqn.substring(0, lastDot) : "";
+	}
+
+	/**
+	 * Escapes a raw string value so it can be safely embedded inside a Java text
+	 * block literal.
+	 * <p>
+	 * Backslashes must be doubled because Java recognises escape sequences (e.g.
+	 * {@code \'} → {@code '}) inside text blocks, which would silently drop a bare
+	 * {@code \} that appears before a quotable character.
+	 *
+	 * @param value the raw runtime string value to escape
+	 * @return the escaped string, safe to embed between {@code """} delimiters
+	 */
+	public static String escapeForTextBlock(String value) {
+		return value.replace("\\", "\\\\");
+	}
+
 }

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

@@ -187,7 +187,7 @@ public void apply(ASTRewrite rewrite, CompilationUnit cu) {
 	 */
 	private static ExpressionMethodReference buildMethodReference(AST ast, PropertySegment segment) {
 		ExpressionMethodReference ref = ast.newExpressionMethodReference();
-		ref.setExpression(ast.newSimpleName(extractSimpleName(segment.domainTypeFqn())));
+		ref.setExpression(ast.newSimpleName(JdtRefactorUtils.extractSimpleName(segment.domainTypeFqn())));
 		ref.setName(ast.newSimpleName(segment.methodName()));
 		return ref;
 	}
@@ -231,18 +231,8 @@ public boolean visit(StringLiteral node) {
 		return result[0];
 	}
 
-	private static String extractSimpleName(String fqn) {
-		int lastDot = fqn.lastIndexOf('.');
-		return lastDot >= 0 ? fqn.substring(lastDot + 1) : fqn;
-	}
-
-	private static String extractPackageName(String fqn) {
-		int lastDot = fqn.lastIndexOf('.');
-		return lastDot >= 0 ? fqn.substring(0, lastDot) : "";
-	}
-
 	private static ClassType classTypeFromFqn(String fqn) {
-		return new ClassType(extractPackageName(fqn), extractSimpleName(fqn));
+		return new ClassType(JdtRefactorUtils.extractPackageName(fqn), JdtRefactorUtils.extractSimpleName(fqn));
 	}
 
 }