Fix for KT-6790 J2K: Static import of Map.Entry is lost during conversion

#KT-6790 fixed

j2k/src/org/jetbrains/kotlin/j2k/importConversion.kt

@@ -58,8 +58,13 @@ private fun Converter.convertImport(fqName: FqName, ref: PsiJavaCodeReferenceEle
     if (!isOnDemand) {
         if (annotationConverter.isImportNotRequired(fqName)) return emptyList()
 
-        // If imported class has a kotlin analog, drop the import
+
-        if (JavaToKotlinClassMap.INSTANCE.isJavaPlatformClass(fqName)) return emptyList()
+        val mapped = JavaToKotlinClassMap.INSTANCE.mapJavaToKotlin(fqName)
+        mapped?.let {
+            // If imported class has a kotlin analog, drop the import if it is not nested
+            if (!it.isNestedClass) return emptyList()
+            return convertNonStaticImport(it.asSingleFqName(), false, null)
+        }
     }
 
     //TODO: how to detect compiled Kotlin here?

j2k/testData/fileOrElement/issues/kt-6790.java

@@ -0,0 +1,6 @@
+import java.util.Map.Entry;
+
+public class A {
+    void foo(Entry<Object, Object> o) {
+    }
+}

j2k/testData/fileOrElement/issues/kt-6790.kt

@@ -0,0 +1,6 @@
+import kotlin.collections.Map.Entry
+
+class A {
+    internal fun foo(o: Entry<Any, Any>) {
+    }
+}

j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterForWebDemoTestGenerated.java

@@ -2927,6 +2927,12 @@ public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaTo
             doTest(fileName);
         }
 
+        @TestMetadata("kt-6790.java")
+        public void testKt_6790() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-6790.java");
+            doTest(fileName);
+        }
+
         @TestMetadata("kt-696.java")
         public void testKt_696() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-696.java");

j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterSingleFileTestGenerated.java

@@ -2927,6 +2927,12 @@ public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaTo
             doTest(fileName);
         }
 
+        @TestMetadata("kt-6790.java")
+        public void testKt_6790() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-6790.java");
+            doTest(fileName);
+        }
+
         @TestMetadata("kt-696.java")
         public void testKt_696() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-696.java");