Java Type Migration: Fix "Convert to ThreadLocal" with subtypes (IDEA-230719)

GitOrigin-RevId: cfcfabbd08f1774900f15089d6fcf651756d743f

java/typeMigration/src/com/intellij/refactoring/typeMigration/rules/ThreadLocalConversionRule.java

@@ -55,7 +55,7 @@ public class ThreadLocalConversionRule extends TypeConversionRule {
           }
         }
         else {
-          return TypeConversionUtil.isAssignable(from, PsiUtil.captureToplevelWildcards(toTypeParameterValue, context));
+          return TypeConversionUtil.isAssignable(toTypeParameterValue, from);
         }
       }
       return !PsiUtil.isLanguageLevel5OrHigher(context);

java/typeMigration/test/com/intellij/refactoring/AllTypeMigrationTestSuite.java

@@ -1,6 +1,8 @@
+// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package com.intellij.refactoring;
 
 import com.intellij.codeInsight.ConvertToAtomicIntentionTest;
+import com.intellij.codeInsight.ConvertToLongAdderIntentionTest;
 import com.intellij.codeInsight.ConvertToThreadLocalIntention6Test;
 import com.intellij.codeInsight.ConvertToThreadLocalIntentionTest;
 import com.intellij.codeInsight.inspections.GuavaInspectionTest;
@@ -17,11 +19,10 @@ import org.junit.runners.Suite;
   ChangeTypeSignatureTest.class,
   WildcardTypeMigrationTest.class,
   ConvertToAtomicIntentionTest.class,
+  ConvertToLongAdderIntentionTest.class,
   ConvertToThreadLocalIntentionTest.class,
   ConvertToThreadLocalIntention6Test.class,
   GuavaInspectionTest.class,
-  GuavaInspectionTest.class,
-  GuavaInspectionTest.class,
 })
 public class AllTypeMigrationTestSuite {
 }

java/typeMigration/test/com/intellij/refactoring/WildcardTypeMigrationTest.java

@@ -1,3 +1,4 @@
+// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package com.intellij.refactoring;
 
 import com.intellij.psi.CommonClassNames;
@@ -125,7 +126,7 @@ public class WildcardTypeMigrationTest extends TypeMigrationTestBase{
   }
 
   //List<? super String> is not assignable to List<String> though it is possible to pass string where ? super String was   
-  public void _testThreadLocalProducerSuper() {
+  public void testThreadLocalProducerSuper() {
     doTestFirstParamType("method",
                          getElementFactory().createTypeFromText("java.lang.ThreadLocal<java.util.List<? super String>>", null));
   }

java/typeMigration/testData/intentions/threadLocal/afterTypeWideningConversion.java

@@ -0,0 +1,19 @@
+// "Convert to 'ThreadLocal'" "true"
+import java.util.Date;
+
+class X {
+    private static final ThreadLocal<DateFormat> dateFormat = ThreadLocal.withInitial(() -> new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss z"));
+
+  public String getDateString() {
+    return dateFormat.get().format(new Date());
+  }
+}
+abstract class DateFormat {
+
+  public final String format(Date date) {
+    return date.toString();
+  }
+}
+class SimpleDateFormat extends DateFormat {
+  public SimpleDateFormat(String patten) {}
+}

java/typeMigration/testData/intentions/threadLocal/beforeTypeWideningConversion.java

@@ -0,0 +1,19 @@
+// "Convert to 'ThreadLocal'" "true"
+import java.util.Date;
+
+class X {
+  private static DateFormat <caret>dateFormat = new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss z");
+
+  public String getDateString() {
+    return dateFormat.format(new Date());
+  }
+}
+abstract class DateFormat {
+
+  public final String format(Date date) {
+    return date.toString();
+  }
+}
+class SimpleDateFormat extends DateFormat {
+  public SimpleDateFormat(String patten) {}
+}

java/typeMigration/testData/refactoring/wildcard/threadLocalConsumerSuper/after/Test.items

@@ -1,9 +1,10 @@
 Types:
+PsiMethodCallExpression:l.substring(0) : java.lang.String
 PsiParameter:l : java.lang.ThreadLocal<? super java.lang.String>
 PsiReferenceExpression:l : java.lang.ThreadLocal<? super java.lang.String>
 
 Conversions:
+l.substring(0) -> $qualifier$.get() $qualifier$ l
 
 New expression type changes:
 Fails:
-l->java.lang.ThreadLocal<? super java.lang.String>

java/typeMigration/testData/refactoring/wildcard/threadLocalConsumerSuper/after/test.java

@@ -1,5 +1,5 @@
 class Test {
   void method(ThreadLocal<? super String> l) {
-    l.substring(0);
+    l.get().substring(0);
   }
 }

java/typeMigration/testData/refactoring/wildcard/threadLocalProducerExtends/after/Test.items

@@ -1,9 +1,10 @@
 Types:
+PsiMethodCallExpression:l.add("") : boolean
 PsiParameter:l : java.lang.ThreadLocal<java.util.List<? extends java.lang.String>>
 PsiReferenceExpression:l : java.lang.ThreadLocal<java.util.List<? extends java.lang.String>>
 
 Conversions:
+l.add("") -> $qualifier$.get() $qualifier$ l
 
 New expression type changes:
 Fails:
-l->java.lang.ThreadLocal<java.util.List<? extends java.lang.String>>

java/typeMigration/testData/refactoring/wildcard/threadLocalProducerExtends/after/test.java

@@ -2,6 +2,6 @@ import java.util.*;
 
 class Test {
   void method(ThreadLocal<List<? extends String>> l) {
-    l.add("");
+    l.get().add("");
   }
 }