Migrate away from deprecated ICleanUpFixCore & CleanUpContextCore.

- Use ICleanUpFix & CleanUpContext Signed-off-by: Roland Grunberg <[email protected]>
eclipse-jdtls · Sep 13, 2024 · f592993 · f592993
1 parent 5471e12
commit f592993
Show file tree

Hide file tree

Showing 16 changed files with 50 additions and 50 deletions.
diff --git a/....ls.core/src/org/eclipse/jdt/ls/core/internal/cleanup/AddDeprecatedAnnotationCleanUp.java b/....ls.core/src/org/eclipse/jdt/ls/core/internal/cleanup/AddDeprecatedAnnotationCleanUp.java
@@ -17,10 +17,10 @@
 import java.util.List;
 
 import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.manipulation.CleanUpContextCore;
-import org.eclipse.jdt.core.manipulation.ICleanUpFixCore;
 import org.eclipse.jdt.internal.corext.fix.CleanUpConstants;
 import org.eclipse.jdt.internal.corext.fix.Java50FixCore;
+import org.eclipse.jdt.ui.cleanup.CleanUpContext;
+import org.eclipse.jdt.ui.cleanup.ICleanUpFix;
 
 /**
  * A cleanup that adds the deprecated annotation to classes/fields/methods that
@@ -36,7 +36,7 @@ public Collection<String> getIdentifiers() {
 	}
 
 	@Override
-	public ICleanUpFixCore createFix(CleanUpContextCore context) {
+	public ICleanUpFix createFix(CleanUpContext context) {
 		return Java50FixCore.createCleanUp(context.getAST(), false, false, true, false);
 	}
 

diff --git a/...dt.ls.core/src/org/eclipse/jdt/ls/core/internal/cleanup/AddOverrideAnnotationCleanUp.java b/...dt.ls.core/src/org/eclipse/jdt/ls/core/internal/cleanup/AddOverrideAnnotationCleanUp.java
@@ -17,10 +17,10 @@
 import java.util.List;
 
 import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.manipulation.CleanUpContextCore;
-import org.eclipse.jdt.core.manipulation.ICleanUpFixCore;
 import org.eclipse.jdt.internal.corext.fix.CleanUpConstants;
 import org.eclipse.jdt.internal.corext.fix.Java50FixCore;
+import org.eclipse.jdt.ui.cleanup.CleanUpContext;
+import org.eclipse.jdt.ui.cleanup.ICleanUpFix;
 
 /**
  * A cleanup that adds the override annotation to all methods that override any
@@ -36,7 +36,7 @@ public Collection<String> getIdentifiers() {
 	}
 
 	@Override
-	public ICleanUpFixCore createFix(CleanUpContextCore context) {
+	public ICleanUpFix createFix(CleanUpContext context) {
 		return Java50FixCore.createCleanUp(context.getAST(), true, true, false, false);
 	}
 

diff --git a/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/cleanup/CleanUpRegistry.java b/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/cleanup/CleanUpRegistry.java
@@ -27,9 +27,9 @@
 import org.eclipse.jdt.core.IJavaProject;
 import org.eclipse.jdt.core.JavaCore;
 import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.manipulation.CleanUpContextCore;
 import org.eclipse.jdt.ls.core.internal.JDTUtils;
 import org.eclipse.jdt.ls.core.internal.JavaLanguageServerPlugin;
+import org.eclipse.jdt.ui.cleanup.CleanUpContext;
 import org.eclipse.lsp4j.TextDocumentIdentifier;
 import org.eclipse.lsp4j.TextEdit;
 
@@ -111,7 +111,7 @@ public List<TextEdit> getEditsForAllActiveCleanUps(TextDocumentIdentifier textDo
 		}
 
 		// build the context after setting the compiler options so that the built AST has all the required markers
-		CleanUpContextCore context = CleanUpUtils.getCleanUpContext(textDocumentId, opts, monitor);
+		CleanUpContext context = CleanUpUtils.getCleanUpContext(textDocumentId, opts, monitor);
 		List<TextEdit> textEdits = new ArrayList<>();
 		ICompilationUnit cu = context.getCompilationUnit();
 

diff --git a/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/cleanup/CleanUpUtils.java b/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/cleanup/CleanUpUtils.java
@@ -19,12 +19,12 @@
 import org.eclipse.jdt.core.ICompilationUnit;
 import org.eclipse.jdt.core.dom.ASTParser;
 import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.manipulation.CleanUpContextCore;
-import org.eclipse.jdt.core.manipulation.ICleanUpFixCore;
 import org.eclipse.jdt.core.refactoring.CompilationUnitChange;
 import org.eclipse.jdt.internal.corext.dom.IASTSharedValues;
 import org.eclipse.jdt.ls.core.internal.JDTUtils;
 import org.eclipse.jdt.ls.core.internal.JavaLanguageServerPlugin;
+import org.eclipse.jdt.ui.cleanup.CleanUpContext;
+import org.eclipse.jdt.ui.cleanup.ICleanUpFix;
 import org.eclipse.lsp4j.TextDocumentIdentifier;
 import org.eclipse.text.edits.TextEdit;
 
@@ -44,14 +44,14 @@ public class CleanUpUtils {
 	 *            the progress monitor
 	 * @return the clean up context for the given text document
 	 */
-	public static CleanUpContextCore getCleanUpContext(TextDocumentIdentifier textDocumentId, Map<String, String> compilerOpts, IProgressMonitor monitor) {
+	public static CleanUpContext getCleanUpContext(TextDocumentIdentifier textDocumentId, Map<String, String> compilerOpts, IProgressMonitor monitor) {
 		ICompilationUnit unit = JDTUtils.resolveCompilationUnit(textDocumentId.getUri());
 		return getCleanUpContext(unit, compilerOpts, monitor);
 	}
 
-	public static CleanUpContextCore getCleanUpContext(ICompilationUnit unit, Map<String, String> compilerOpts, IProgressMonitor monitor) {
+	public static CleanUpContext getCleanUpContext(ICompilationUnit unit, Map<String, String> compilerOpts, IProgressMonitor monitor) {
 		CompilationUnit ast = createASTWithOpts(unit, compilerOpts, monitor);
-		return new CleanUpContextCore(unit, ast);
+		return new CleanUpContext(unit, ast);
 	}
 
 	/**
@@ -65,10 +65,10 @@ public static CleanUpContextCore getCleanUpContext(ICompilationUnit unit, Map<St
 	 *            the progress monitor
 	 * @return a non-null list of text edits for the given clean up
 	 */
-	public static TextEdit getTextEditFromCleanUp(ISimpleCleanUp cleanUp, CleanUpContextCore context, IProgressMonitor monitor) {
+	public static TextEdit getTextEditFromCleanUp(ISimpleCleanUp cleanUp, CleanUpContext context, IProgressMonitor monitor) {
 
 		try {
-			ICleanUpFixCore fix = cleanUp != null ? cleanUp.createFix(context) : null;
+			ICleanUpFix fix = cleanUp != null ? cleanUp.createFix(context) : null;
 			if (fix == null) {
 				return null;
 			}

diff --git a/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/cleanup/ISimpleCleanUp.java b/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/cleanup/ISimpleCleanUp.java
@@ -16,8 +16,8 @@
 import java.util.List;
 
 import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.manipulation.CleanUpContextCore;
-import org.eclipse.jdt.core.manipulation.ICleanUpFixCore;
+import org.eclipse.jdt.ui.cleanup.CleanUpContext;
+import org.eclipse.jdt.ui.cleanup.ICleanUpFix;
 
 /**
  * Represents a cleanup change that doesn't need any further configuration (eg.
@@ -39,7 +39,7 @@ public interface ISimpleCleanUp {
 	 *            the context for the clean up (the compilation unit and the AST)
 	 * @return the cleanup fix for the given source file
 	 */
-	ICleanUpFixCore createFix(CleanUpContextCore context) throws CoreException;
+	ICleanUpFix createFix(CleanUpContext context) throws CoreException;
 
 	/**
 	 * Returns a list of all compiler markers (i.e. info, warning, error) that are

diff --git a/...ipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/cleanup/InstanceofPatternMatch.java b/...ipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/cleanup/InstanceofPatternMatch.java
@@ -17,10 +17,10 @@
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.manipulation.CleanUpContextCore;
-import org.eclipse.jdt.core.manipulation.ICleanUpFixCore;
 import org.eclipse.jdt.internal.corext.fix.CleanUpConstants;
 import org.eclipse.jdt.internal.corext.fix.PatternMatchingForInstanceofFixCore;
+import org.eclipse.jdt.ui.cleanup.CleanUpContext;
+import org.eclipse.jdt.ui.cleanup.ICleanUpFix;
 
 /**
  * Represents a cleanup that uses pattern matching for 'instanceof' cast checks
@@ -33,7 +33,7 @@ public List<String> getIdentifiers() {
 	}
 
 	@Override
-	public ICleanUpFixCore createFix(CleanUpContextCore context) throws CoreException {
+	public ICleanUpFix createFix(CleanUpContext context) throws CoreException {
 		CompilationUnit unit = context.getAST();
 		if (unit == null) {
 			return null;

diff --git a/...eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/cleanup/InvertEqualsCleanUp.java b/...eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/cleanup/InvertEqualsCleanUp.java
@@ -17,10 +17,10 @@
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.manipulation.CleanUpContextCore;
-import org.eclipse.jdt.core.manipulation.ICleanUpFixCore;
 import org.eclipse.jdt.internal.corext.fix.CleanUpConstants;
 import org.eclipse.jdt.internal.corext.fix.InvertEqualsFixCore;
+import org.eclipse.jdt.ui.cleanup.CleanUpContext;
+import org.eclipse.jdt.ui.cleanup.ICleanUpFix;
 
 /**
  * Represents a clean up that inverts calls to Object.equals(Object) and
@@ -34,7 +34,7 @@ public List<String> getIdentifiers() {
 	}
 
 	@Override
-	public ICleanUpFixCore createFix(CleanUpContextCore context) throws CoreException {
+	public ICleanUpFix createFix(CleanUpContext context) throws CoreException {
 		CompilationUnit unit = context.getAST();
 		if (unit == null) {
 			return null;

diff --git a/...ore/src/org/eclipse/jdt/ls/core/internal/cleanup/LambdaExpressionAndMethodRefCleanUp.java b/...ore/src/org/eclipse/jdt/ls/core/internal/cleanup/LambdaExpressionAndMethodRefCleanUp.java
@@ -18,10 +18,10 @@
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.manipulation.CleanUpContextCore;
-import org.eclipse.jdt.core.manipulation.ICleanUpFixCore;
 import org.eclipse.jdt.internal.corext.fix.CleanUpConstants;
 import org.eclipse.jdt.internal.corext.fix.LambdaExpressionAndMethodRefFixCore;
+import org.eclipse.jdt.ui.cleanup.CleanUpContext;
+import org.eclipse.jdt.ui.cleanup.ICleanUpFix;
 
 /**
  * Represents a cleanup that does several actions to clean up lambda expression
@@ -34,7 +34,7 @@ public Collection<String> getIdentifiers() {
 	}
 
 	@Override
-	public ICleanUpFixCore createFix(CleanUpContextCore context) throws CoreException {
+	public ICleanUpFix createFix(CleanUpContext context) throws CoreException {
 		CompilationUnit unit = context.getAST();
 		if (unit == null) {
 			return null;

diff --git a/...pse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/cleanup/LambdaExpressionCleanup.java b/...pse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/cleanup/LambdaExpressionCleanup.java
@@ -18,10 +18,10 @@
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.manipulation.CleanUpContextCore;
-import org.eclipse.jdt.core.manipulation.ICleanUpFixCore;
 import org.eclipse.jdt.internal.corext.fix.CleanUpConstants;
 import org.eclipse.jdt.internal.corext.fix.LambdaExpressionsFixCore;
+import org.eclipse.jdt.ui.cleanup.CleanUpContext;
+import org.eclipse.jdt.ui.cleanup.ICleanUpFix;
 
 /**
  * Represents a cleanup that converts an anonymous class creation to a lambda expression
@@ -34,7 +34,7 @@ public Collection<String> getIdentifiers() {
 	}
 
 	@Override
-	public ICleanUpFixCore createFix(CleanUpContextCore context) throws CoreException {
+	public ICleanUpFix createFix(CleanUpContext context) throws CoreException {
 		CompilationUnit unit = context.getAST();
 		if (unit == null) {
 			return null;

diff --git a/...jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/cleanup/MemberAccessUsesThisCleanUp.java b/...jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/cleanup/MemberAccessUsesThisCleanUp.java
@@ -18,9 +18,9 @@
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.manipulation.CleanUpContextCore;
-import org.eclipse.jdt.core.manipulation.ICleanUpFixCore;
 import org.eclipse.jdt.internal.corext.fix.CodeStyleFixCore;
+import org.eclipse.jdt.ui.cleanup.CleanUpContext;
+import org.eclipse.jdt.ui.cleanup.ICleanUpFix;
 
 /**
  * Represents a clean up that prefixes all (non-static) field and method
@@ -34,7 +34,7 @@ public Collection<String> getIdentifiers() {
 	}
 
 	@Override
-	public ICleanUpFixCore createFix(CleanUpContextCore context) throws CoreException {
+	public ICleanUpFix createFix(CleanUpContext context) throws CoreException {
 		CompilationUnit unit = context.getAST();
 		if (unit == null) {
 			return null;

diff --git a/...s.core/src/org/eclipse/jdt/ls/core/internal/cleanup/StaticAccessUsesClassNameCleanUp.java b/...s.core/src/org/eclipse/jdt/ls/core/internal/cleanup/StaticAccessUsesClassNameCleanUp.java
@@ -18,9 +18,9 @@
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.manipulation.CleanUpContextCore;
-import org.eclipse.jdt.core.manipulation.ICleanUpFixCore;
 import org.eclipse.jdt.internal.corext.fix.CodeStyleFixCore;
+import org.eclipse.jdt.ui.cleanup.CleanUpContext;
+import org.eclipse.jdt.ui.cleanup.ICleanUpFix;
 
 /**
  * Represents a clean up that prefixes all static member accesses with the
@@ -34,7 +34,7 @@ public Collection<String> getIdentifiers() {
 	}
 
 	@Override
-	public ICleanUpFixCore createFix(CleanUpContextCore context) throws CoreException {
+	public ICleanUpFix createFix(CleanUpContext context) throws CoreException {
 		CompilationUnit unit = context.getAST();
 		if (unit == null) {
 			return null;

diff --git a/....ls.core/src/org/eclipse/jdt/ls/core/internal/cleanup/StringConcatToTextBlockCleanUp.java b/....ls.core/src/org/eclipse/jdt/ls/core/internal/cleanup/StringConcatToTextBlockCleanUp.java
@@ -18,10 +18,10 @@
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.manipulation.CleanUpContextCore;
-import org.eclipse.jdt.core.manipulation.ICleanUpFixCore;
 import org.eclipse.jdt.internal.corext.fix.CleanUpConstants;
 import org.eclipse.jdt.internal.corext.fix.StringConcatToTextBlockFixCore;
+import org.eclipse.jdt.ui.cleanup.CleanUpContext;
+import org.eclipse.jdt.ui.cleanup.ICleanUpFix;
 
 /**
  * Represents a clean up that converts string concatenaton to Text Blocks
@@ -34,7 +34,7 @@ public Collection<String> getIdentifiers() {
 	}
 
 	@Override
-	public ICleanUpFixCore createFix(CleanUpContextCore context) throws CoreException {
+	public ICleanUpFix createFix(CleanUpContext context) throws CoreException {
 		CompilationUnit unit = context.getAST();
 		if (unit == null) {
 			return null;

diff --git a/...pse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/cleanup/SwitchExpressionCleanup.java b/...pse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/cleanup/SwitchExpressionCleanup.java
@@ -18,10 +18,10 @@
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.manipulation.CleanUpContextCore;
-import org.eclipse.jdt.core.manipulation.ICleanUpFixCore;
 import org.eclipse.jdt.internal.corext.fix.CleanUpConstants;
 import org.eclipse.jdt.internal.corext.fix.SwitchExpressionsFixCore;
+import org.eclipse.jdt.ui.cleanup.CleanUpContext;
+import org.eclipse.jdt.ui.cleanup.ICleanUpFix;
 
 /**
  * Represents a cleanup that converts a switch statement to a switch expression
@@ -34,7 +34,7 @@ public Collection<String> getIdentifiers() {
 	}
 
 	@Override
-	public ICleanUpFixCore createFix(CleanUpContextCore context) throws CoreException {
+	public ICleanUpFix createFix(CleanUpContext context) throws CoreException {
 		CompilationUnit unit = context.getAST();
 		if (unit == null) {
 			return null;

diff --git a/...ipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/cleanup/TryWithResourceCleanUp.java b/...ipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/cleanup/TryWithResourceCleanUp.java
@@ -18,10 +18,10 @@
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.manipulation.CleanUpContextCore;
-import org.eclipse.jdt.core.manipulation.ICleanUpFixCore;
 import org.eclipse.jdt.internal.corext.fix.CleanUpConstants;
 import org.eclipse.jdt.internal.corext.fix.TryWithResourceFixCore;
+import org.eclipse.jdt.ui.cleanup.CleanUpContext;
+import org.eclipse.jdt.ui.cleanup.ICleanUpFix;
 
 /**
  * Represents a clean up that simplifies the finally block to using a
@@ -35,7 +35,7 @@ public Collection<String> getIdentifiers() {
 	}
 
 	@Override
-	public ICleanUpFixCore createFix(CleanUpContextCore context) throws CoreException {
+	public ICleanUpFix createFix(CleanUpContext context) throws CoreException {
 		CompilationUnit unit = context.getAST();
 		if (unit == null) {
 			return null;

diff --git a/...t.ls.core/src/org/eclipse/jdt/ls/core/internal/cleanup/VariableDeclarationFixCleanup.java b/...t.ls.core/src/org/eclipse/jdt/ls/core/internal/cleanup/VariableDeclarationFixCleanup.java
@@ -18,10 +18,10 @@
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.manipulation.CleanUpContextCore;
-import org.eclipse.jdt.core.manipulation.ICleanUpFixCore;
 import org.eclipse.jdt.internal.corext.fix.CleanUpConstants;
 import org.eclipse.jdt.internal.corext.fix.VariableDeclarationFixCore;
+import org.eclipse.jdt.ui.cleanup.CleanUpContext;
+import org.eclipse.jdt.ui.cleanup.ICleanUpFix;
 
 /**
  * Represents a cleanup that adds the 'final' modifier where possible
@@ -34,7 +34,7 @@ public Collection<String> getIdentifiers() {
 	}
 
 	@Override
-	public ICleanUpFixCore createFix(CleanUpContextCore context) throws CoreException {
+	public ICleanUpFix createFix(CleanUpContext context) throws CoreException {
 		CompilationUnit unit = context.getAST();
 		if (unit == null) {
 			return null;

diff --git a/.../org/eclipse/jdt/ls/core/internal/corrections/proposals/ReorgCorrectionsSubProcessor.java b/.../org/eclipse/jdt/ls/core/internal/corrections/proposals/ReorgCorrectionsSubProcessor.java
@@ -24,7 +24,6 @@
 import org.eclipse.jdt.core.dom.IBinding;
 import org.eclipse.jdt.core.manipulation.CUCorrectionProposalCore;
 import org.eclipse.jdt.core.manipulation.ChangeCorrectionProposalCore;
-import org.eclipse.jdt.core.manipulation.ICleanUpFixCore;
 import org.eclipse.jdt.core.refactoring.CompilationUnitChange;
 import org.eclipse.jdt.internal.core.manipulation.util.BasicElementLabels;
 import org.eclipse.jdt.internal.corext.fix.IProposableFix;
@@ -41,6 +40,7 @@
 import org.eclipse.jdt.ls.core.internal.corrections.CorrectionMessages;
 import org.eclipse.jdt.ls.core.internal.corrections.ProposalKindWrapper;
 import org.eclipse.jdt.ls.core.internal.handlers.CodeActionHandler;
+import org.eclipse.jdt.ui.cleanup.ICleanUpFix;
 import org.eclipse.jdt.ui.text.java.IInvocationContext;
 import org.eclipse.jdt.ui.text.java.IProblemLocation;
 import org.eclipse.lsp4j.CodeActionKind;
@@ -112,7 +112,7 @@ protected ProposalKindWrapper createOrganizeImportsProposal(String name, Change
 	@Override
 	public void addRemoveImportStatementProposals(IInvocationContext context, IProblemLocation problem, Collection<ProposalKindWrapper> proposals) {
 		super.addRemoveImportStatementProposals(context, problem, proposals);
-		ICleanUpFixCore removeAllUnusedImportsFix = UnusedCodeFixCore.createCleanUp(context.getASTRoot(), false, false, false, false, false, true, false, false);
+		ICleanUpFix removeAllUnusedImportsFix = UnusedCodeFixCore.createCleanUp(context.getASTRoot(), false, false, false, false, false, true, false, false);
 		if (removeAllUnusedImportsFix != null) {
 			try {
 				CompilationUnitChange change = removeAllUnusedImportsFix.createChange(null);