Fix lambda cleanup to not generate if interface method is generic (#1199

) - fixes #1198 - add new test to CleanUpTest1d8
eclipse-jdt · Mar 9, 2024 · cb1cc46 · cb1cc46
1 parent 16ca3ea
commit cb1cc46
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 1 deletion.
diff --git a/...pulation/core extension/org/eclipse/jdt/internal/corext/fix/LambdaExpressionsFixCore.java b/...pulation/core extension/org/eclipse/jdt/internal/corext/fix/LambdaExpressionsFixCore.java
@@ -1292,7 +1292,7 @@ public static boolean isFunctionalAnonymous(ClassInstanceCreation node) {
 		if (interfaces.length != 1) {
 			return false;
 		}
-		if (interfaces[0].getFunctionalInterfaceMethod() == null) {
+		if (interfaces[0].getFunctionalInterfaceMethod() == null || interfaces[0].getFunctionalInterfaceMethod().isGenericMethod()) {
 			return false;
 		}
 

diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/CleanUpTest1d8.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/CleanUpTest1d8.java
@@ -2261,6 +2261,41 @@ public void testDoNotConvertLocalRecursiveClass() throws Exception {
 		assertRefactoringHasNoChange(new ICompilationUnit[] { cu });
 	}
 
+	@Test
+	public void testDoNotConvertGenericInterface() throws Exception {
+		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
+		String sample= "" //
+				+ "package test1;\n" //
+				+ "\n" //
+				+ "public class C2 {\n" //
+				+ "\n" //
+				+ "    public interface IInteractionContext {\n" //
+				+ "    }\n" //
+				+ "\n" //
+				+ "    public interface IAdaptable {\n" //
+				+ "        public <T> T getAdapter(Class<T> adapter);\n" //
+				+ "    }\n" //
+				+ "\n" //
+				+ "    @SuppressWarnings(\"unchecked\")\n" //
+				+ "    public IAdaptable asAdaptable(final IInteractionContext result) {\n" //
+				+ "        return new IAdaptable() {\n" //
+				+ "            public Object getAdapter(Class adapter) {\n" //
+				+ "                if (adapter == IInteractionContext.class) {\n" //
+				+ "                    return result;\n" //
+				+ "                }\n" //
+				+ "                return null;\n" //
+				+ "            }\n" //
+				+ "        };\n" //
+				+ "    }\n" //
+				+ "}\n"; //
+		ICompilationUnit cu= pack1.createCompilationUnit("C2.java", sample, false, null);
+
+		enable(CleanUpConstants.CONVERT_FUNCTIONAL_INTERFACES);
+		enable(CleanUpConstants.USE_LAMBDA);
+
+		assertRefactoringHasNoChange(new ICompilationUnit[] { cu });
+	}
+
 	@Test
 	public void testComparingOnCriteria() throws Exception {
 		// Given