diff --git a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/UseExplicitEncodingFixCore.java b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/UseExplicitEncodingFixCore.java
index 3e391ebf0ee..1465dba8088 100644
--- a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/UseExplicitEncodingFixCore.java	
+++ b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/UseExplicitEncodingFixCore.java	
@@ -92,7 +92,7 @@ public void findOperations(final CompilationUnit compilationUnit,final Set<Compi
 		explicitencoding.find(this, compilationUnit, operations, nodesprocessed, cb);
 	}
 
-	public CompilationUnitRewriteOperation rewrite(final ASTNode visited, ChangeBehavior cb, ReferenceHolder data) {
+	public CompilationUnitRewriteOperation rewrite(final ASTNode visited, ChangeBehavior cb, ReferenceHolder<ASTNode, Object> data) {
 		return new CompilationUnitRewriteOperation() {
 			@Override
 			public void rewriteAST(final CompilationUnitRewrite cuRewrite, final LinkedProposalModelCore linkedModel) throws CoreException {
diff --git a/org.eclipse.jdt.ui.tests.junit5/src/org/eclipse/jdt/ui/tests/quickfix/Java8/ExplicitEncodingCleanUpTest.java b/org.eclipse.jdt.ui.tests.junit5/src/org/eclipse/jdt/ui/tests/quickfix/Java8/ExplicitEncodingCleanUpTest.java
index 735d0dee818..5e5e9421135 100644
--- a/org.eclipse.jdt.ui.tests.junit5/src/org/eclipse/jdt/ui/tests/quickfix/Java8/ExplicitEncodingCleanUpTest.java
+++ b/org.eclipse.jdt.ui.tests.junit5/src/org/eclipse/jdt/ui/tests/quickfix/Java8/ExplicitEncodingCleanUpTest.java
@@ -3,14 +3,13 @@
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.jdt.core.ICompilationUnit;
 import org.eclipse.jdt.core.IPackageFragment;
+import org.eclipse.jdt.internal.corext.fix.CleanUpConstants;
+import org.eclipse.jdt.ui.tests.quickfix.rules.AbstractEclipseJava;
+import org.eclipse.jdt.ui.tests.quickfix.rules.EclipseJava8;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.EnumSource;
-import org.eclipse.jdt.internal.corext.fix.CleanUpConstants;
-import org.eclipse.jdt.ui.tests.quickfix.rules.AbstractEclipseJava;
-import org.eclipse.jdt.ui.tests.quickfix.rules.EclipseJava10;
-import org.eclipse.jdt.ui.tests.quickfix.rules.EclipseJava8;
 
 public class ExplicitEncodingCleanUpTest {