Do not compute unnecessary UUID for Range

spring-projects · Feb 26, 2025 · b484f98 · b484f98
1 parent 07f930f
commit b484f98
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 12 deletions.
diff --git a/.../springframework/ide/vscode/boot/java/reconcilers/AbstractSecurityLamdaDslReconciler.java b/.../springframework/ide/vscode/boot/java/reconcilers/AbstractSecurityLamdaDslReconciler.java
@@ -50,7 +50,7 @@ public boolean visit(MethodInvocation node) {
 							ReconcileUtils.setRewriteFixes(registry, problem, List.of(
 									new FixDescriptor(getRecipeId(), List.of(uri),
 											ReconcileUtils.buildLabel(getFixLabel(), RecipeScope.NODE))
-											.withRangeScope(ReconcileUtils.createOpenRewriteRange(cu, topMethodInvocation))
+											.withRangeScope(ReconcileUtils.createOpenRewriteRange(cu, topMethodInvocation, null))
 											.withRecipeScope(RecipeScope.NODE),
 									new FixDescriptor(getRecipeId(), List.of(uri),
 											ReconcileUtils.buildLabel(getFixLabel(), RecipeScope.FILE))

diff --git a/...rk/ide/vscode/boot/java/reconcilers/AutowiredFieldIntoConstructorParameterReconciler.java b/...rk/ide/vscode/boot/java/reconcilers/AutowiredFieldIntoConstructorParameterReconciler.java
@@ -137,7 +137,7 @@ private ReconcileProblemImpl createProblem(CompilationUnit cu, FieldDeclaration
 				: "") + typeDecl.getName().getFullyQualifiedName();
 		ReconcileUtils.setRewriteFixes(registry, problem,
 				List.of(new FixDescriptor(ConvertAutowiredFieldIntoConstructorParameter.class.getName(), List.of(docUri.toASCIIString()), LABEL)
-						.withRangeScope(ReconcileUtils.createOpenRewriteRange(cu, typeDecl))
+						.withRangeScope(ReconcileUtils.createOpenRewriteRange(cu, typeDecl, null))
 						.withParameters(Map.of("classFqName", typeFqName, "fieldName", fieldName))
 						.withRecipeScope(RecipeScope.NODE)));
 		return problem;

diff --git a/...a/org/springframework/ide/vscode/boot/java/reconcilers/BeanMethodNotPublicReconciler.java b/...a/org/springframework/ide/vscode/boot/java/reconcilers/BeanMethodNotPublicReconciler.java
@@ -151,9 +151,9 @@ private void addQuickFixes(CompilationUnit cu, URI docUri, ReconcileProblemImpl
 
 			FixDescriptor fix1 = new FixDescriptor(id, List.of(docUri.toASCIIString()), LABEL)
 					.withRecipeScope(RecipeScope.NODE)
-					.withRangeScope(ReconcileUtils.createOpenRewriteRange(cu, method));
+					.withRangeScope(ReconcileUtils.createOpenRewriteRange(cu, method, null));
 
-			Range methodRange = ReconcileUtils.createOpenRewriteRange(cu, method);
+			Range methodRange = ReconcileUtils.createOpenRewriteRange(cu, method, null);
 			fix1 = fix1.withRangeScope(methodRange);
 
 			FixDescriptor fix2 = new FixDescriptor(id, List.of(docUri.toASCIIString()), ReconcileUtils.buildLabel(LABEL, RecipeScope.FILE))

diff --git a/...ngframework/ide/vscode/boot/java/reconcilers/BeanPostProcessingIgnoreInAotReconciler.java b/...ngframework/ide/vscode/boot/java/reconcilers/BeanPostProcessingIgnoreInAotReconciler.java
@@ -96,7 +96,7 @@ public boolean visit(ReturnStatement node) {
 						ReconcileProblemImpl problem = new ReconcileProblemImpl(getProblemType(), LABEL, typeDecl.getName().getStartPosition(), typeDecl.getName().getLength());
 						ReconcileUtils.setRewriteFixes(registry, problem, List.of(
 								new FixDescriptor(BeanPostProcessingIgnoreInAot.class.getName(), List.of(docUri.toASCIIString()), ReconcileUtils.buildLabel(LABEL, RecipeScope.NODE))
-										.withRangeScope(ReconcileUtils.createOpenRewriteRange(cu, typeDecl))
+										.withRangeScope(ReconcileUtils.createOpenRewriteRange(cu, typeDecl, null))
 										.withRecipeScope(RecipeScope.NODE)
 						));
 						problemCollector.accept(problem);

diff --git a/...pringframework/ide/vscode/boot/java/reconcilers/ImplicitWebAnnotationNamesReconciler.java b/...pringframework/ide/vscode/boot/java/reconcilers/ImplicitWebAnnotationNamesReconciler.java
@@ -97,7 +97,7 @@ private void processWebAnnotation(Annotation a) {
 					ReconcileProblemImpl problem = new ReconcileProblemImpl(getProblemType(), PROBLEM_LABEL, nodeForProblemRange.getStartPosition(), nodeForProblemRange.getLength());
 
 					String uri = docUri.toASCIIString();
-					Range range = ReconcileUtils.createOpenRewriteRange(cu, a);
+					Range range = ReconcileUtils.createOpenRewriteRange(cu, a, null);
 					ReconcileUtils.setRewriteFixes(registry, problem, List.of(
 							new FixDescriptor(org.openrewrite.java.spring.ImplicitWebAnnotationNames.class.getName(), List.of(uri), FIX_LABEL)
 								.withRangeScope(range)

diff --git a/.../springframework/ide/vscode/boot/java/reconcilers/NoAutowiredOnConstructorReconciler.java b/.../springframework/ide/vscode/boot/java/reconcilers/NoAutowiredOnConstructorReconciler.java
@@ -90,7 +90,7 @@ public boolean visit(TypeDeclaration typeDecl) {
 							ReconcileUtils.setRewriteFixes(registry, problem,
 									List.of(new FixDescriptor(NoAutowiredOnConstructor.class.getName(), List.of(docUri.toASCIIString()), FIX_LABEL)
 											.withRecipeScope(RecipeScope.NODE)
-											.withRangeScope(ReconcileUtils.createOpenRewriteRange(cu, typeDecl))));
+											.withRangeScope(ReconcileUtils.createOpenRewriteRange(cu, typeDecl, null))));
 							problemCollector.accept(problem);
 						}
 					}

diff --git a/...pringframework/ide/vscode/boot/java/reconcilers/NoRequestMappingAnnotationReconciler.java b/...pringframework/ide/vscode/boot/java/reconcilers/NoRequestMappingAnnotationReconciler.java
@@ -96,7 +96,7 @@ private void processAnnotation(Annotation a) {
 					List<String> requestMethods = getRequestMethods(cu, a);
 					if (!requestMethods.isEmpty() && !requestMethods.contains(UNSUPPORTED_REQUEST_METHOD)) {
 						String uri = docUri.toASCIIString();
-						Range range = ReconcileUtils.createOpenRewriteRange(cu, a);
+						Range range = ReconcileUtils.createOpenRewriteRange(cu, a, null);
 						if (requestMethods.size() == 1 && SUPPORTED_REQUEST_METHODS.contains(requestMethods.get(0))) {
 							ReconcileProblemImpl problem = new ReconcileProblemImpl(getProblemType(), PROBLEM_LABEL, a.getStartPosition(), a.getLength());
 							ReconcileUtils.setRewriteFixes(registry, problem, List.of(

diff --git a/.../java/org/springframework/ide/vscode/boot/java/reconcilers/PreciseBeanTypeReconciler.java b/.../java/org/springframework/ide/vscode/boot/java/reconcilers/PreciseBeanTypeReconciler.java
@@ -99,7 +99,7 @@ public void endVisit(MethodDeclaration method) {
 						ReconcileUtils.setRewriteFixes(registry, problem, List.of(
 							new FixDescriptor(recipeId, List.of(uri), ReconcileUtils.buildLabel("Replace return type with '" + replacementType + "'", RecipeScope.NODE))
 								.withRecipeScope(RecipeScope.NODE)
-								.withRangeScope(ReconcileUtils.createOpenRewriteRange(cu, method)),
+								.withRangeScope(ReconcileUtils.createOpenRewriteRange(cu, method, null)),
 							new FixDescriptor(recipeId, List.of(uri), ReconcileUtils.buildLabel(LABEL, RecipeScope.FILE))
 								.withRecipeScope(RecipeScope.FILE),
 							new FixDescriptor(recipeId, List.of(uri), ReconcileUtils.buildLabel(LABEL, RecipeScope.PROJECT))

diff --git a/...er/src/main/java/org/springframework/ide/vscode/boot/java/reconcilers/ReconcileUtils.java b/...er/src/main/java/org/springframework/ide/vscode/boot/java/reconcilers/ReconcileUtils.java
@@ -12,6 +12,7 @@
 
 import java.util.Collection;
 import java.util.Iterator;
+import java.util.UUID;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.eclipse.jdt.core.dom.ASTNode;
@@ -23,7 +24,6 @@
 import org.eclipse.jdt.core.dom.ImportDeclaration;
 import org.eclipse.jdt.core.dom.Name;
 import org.eclipse.jdt.core.dom.SimpleType;
-import org.openrewrite.Tree;
 import org.openrewrite.marker.Range;
 import org.springframework.ide.vscode.boot.java.annotations.AnnotationHierarchies;
 import org.springframework.ide.vscode.boot.java.rewrite.RewriteRefactorings;
@@ -36,7 +36,7 @@
 
 public class ReconcileUtils {
 
-	public static Range createOpenRewriteRange(CompilationUnit cu, ASTNode node) {
+	public static Range createOpenRewriteRange(CompilationUnit cu, ASTNode node, UUID id) {
 
 		int startOffset = node.getStartPosition();
 		int startLine = cu.getLineNumber(startOffset);
@@ -49,7 +49,7 @@ public static Range createOpenRewriteRange(CompilationUnit cu, ASTNode node) {
 		Range.Position startPosition = new Range.Position(startOffset, startLine, startColumn);
 		Range.Position endPosition = new Range.Position(endOffset, endLine, endColumn);
 
-		return new Range(Tree.randomId(), startPosition, endPosition);
+		return new Range(id, startPosition, endPosition);
 	}
 
 	public static QuickfixType getRewriteQuickFixType(QuickfixRegistry registry) {