consulo · VISTALL · May 10, 2025 · May 9, 2025
diff --git a/...com/intellij/java/analysis/impl/codeInspection/miscGenerics/SuspiciousMethodCallUtil.java b/...com/intellij/java/analysis/impl/codeInspection/miscGenerics/SuspiciousMethodCallUtil.java
@@ -10,7 +10,6 @@
 import com.siyeh.ig.psiutils.TypeUtils;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.application.util.NullableLazyValue;
-import consulo.java.language.module.util.JavaClassNames;
 import consulo.language.editor.inspection.InspectionsBundle;
 import consulo.language.editor.inspection.localize.InspectionLocalize;
 import consulo.language.psi.PsiElement;
@@ -19,23 +18,22 @@
 import consulo.language.psi.util.PsiTreeUtil;
 import consulo.util.collection.ArrayUtil;
 import consulo.util.lang.ObjectUtil;
+import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 import org.jetbrains.annotations.Contract;
 
-import jakarta.annotation.Nonnull;
-
 import java.util.List;
 
 public class SuspiciousMethodCallUtil {
 
     // List.of/Set.of are unnecessary here as they don't accept nulls
     private static final CallMatcher.Simple SINGLETON_COLLECTION =
-        CallMatcher.staticCall(JavaClassNames.JAVA_UTIL_COLLECTIONS, "singletonList", "singleton").parameterCount(1);
+        CallMatcher.staticCall(CommonClassNames.JAVA_UTIL_COLLECTIONS, "singletonList", "singleton").parameterCount(1);
 
     @RequiredReadAction
     private static void setupPatternMethods(PsiManager manager, GlobalSearchScope searchScope, List<? super PatternMethod> patternMethods) {
         JavaPsiFacade javaPsiFacade = JavaPsiFacade.getInstance(manager.getProject());
-        PsiClass collectionClass = javaPsiFacade.findClass(JavaClassNames.JAVA_UTIL_COLLECTION, searchScope);
+        PsiClass collectionClass = javaPsiFacade.findClass(CommonClassNames.JAVA_UTIL_COLLECTION, searchScope);
         PsiClassType object = PsiType.getJavaLangObject(manager, searchScope);
         PsiType[] javaLangObject = {object};
         PsiType[] twoObjects = {
@@ -58,13 +56,13 @@ private static void setupPatternMethods(PsiManager manager, GlobalSearchScope se
             }
         }
 
-        PsiClass listClass = javaPsiFacade.findClass(JavaClassNames.JAVA_UTIL_LIST, searchScope);
+        PsiClass listClass = javaPsiFacade.findClass(CommonClassNames.JAVA_UTIL_LIST, searchScope);
         if (listClass != null) {
             addSingleParameterMethod(patternMethods, listClass, "indexOf", object);
             addSingleParameterMethod(patternMethods, listClass, "lastIndexOf", object);
         }
 
-        PsiClass mapClass = javaPsiFacade.findClass(JavaClassNames.JAVA_UTIL_MAP, searchScope);
+        PsiClass mapClass = javaPsiFacade.findClass(CommonClassNames.JAVA_UTIL_MAP, searchScope);
         if (mapClass != null) {
             PsiMethod remove = MethodSignatureUtil.findMethodBySignature(mapClass, removeSignature, false);
             addMethod(remove, 0, patternMethods, 0);
@@ -104,7 +102,7 @@ private static void setupPatternMethods(PsiManager manager, GlobalSearchScope se
             addMethod(containsValue, 1, patternMethods, 0);
         }
 
-        PsiClass concurrentMapClass = javaPsiFacade.findClass(JavaClassNames.JAVA_UTIL_CONCURRENT_HASH_MAP, searchScope);
+        PsiClass concurrentMapClass = javaPsiFacade.findClass(CommonClassNames.JAVA_UTIL_CONCURRENT_HASH_MAP, searchScope);
         if (concurrentMapClass != null) {
             MethodSignature containsSignature =
                 MethodSignatureUtil.createMethodSignature("contains", javaLangObject, PsiTypeParameter.EMPTY_ARRAY, PsiSubstitutor.EMPTY);
@@ -276,7 +274,7 @@ public static String getSuspiciousMethodCallMessage(
 
         if (arg instanceof PsiConditionalExpression
             && argType != null
-            && argType.equalsToText(JavaClassNames.JAVA_LANG_OBJECT)
+            && argType.equalsToText(CommonClassNames.JAVA_LANG_OBJECT)
             && PsiPolyExpressionUtil.isPolyExpression(arg)) {
             return null;
         }
@@ -361,7 +359,7 @@ public static String getSuspiciousMethodCallMessage(
             PsiParameter[] parameters = method.getParameterList().getParameters();
             if (parameters.length == 1 && ("removeAll".equals(method.getName()) || "retainAll".equals(method.getName()))) {
                 PsiType paramType = parameters[0].getType();
-                if (InheritanceUtil.isInheritor(paramType, JavaClassNames.JAVA_UTIL_COLLECTION)) {
+                if (InheritanceUtil.isInheritor(paramType, CommonClassNames.JAVA_UTIL_COLLECTION)) {
                     PsiType qualifierType = qualifier.getType();
                     if (qualifierType != null) {
                         PsiType itemType = JavaGenericsUtil.getCollectionItemType(argType, calleeMethod.getResolveScope());
@@ -422,7 +420,7 @@ public static String getSuspiciousMethodCallMessage(
     }
 
     private static String getPreciseObjectTitle(PsiClass patternClass, int index) {
-        if (InheritanceUtil.isInheritor(patternClass, JavaClassNames.JAVA_UTIL_MAP)) {
+        if (InheritanceUtil.isInheritor(patternClass, CommonClassNames.JAVA_UTIL_MAP)) {
             return index == 0 ? "keys" : "values";
         }
 

diff --git a/java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/StreamApiUtil.java b/java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/StreamApiUtil.java
@@ -18,7 +18,6 @@
 import com.intellij.java.language.psi.*;
 import com.intellij.java.language.psi.util.InheritanceUtil;
 import com.intellij.java.language.psi.util.PsiUtil;
-import consulo.java.language.module.util.JavaClassNames;
 import org.jetbrains.annotations.Contract;
 
 /**
@@ -36,19 +35,19 @@ public static PsiType getStreamElementType(PsiType type, boolean variableType) {
       return null;
     }
     PsiClass aClass = ((PsiClassType) type).resolve();
-    if (InheritanceUtil.isInheritor(aClass, false, JavaClassNames.JAVA_UTIL_STREAM_INT_STREAM)) {
+    if (InheritanceUtil.isInheritor(aClass, false, CommonClassNames.JAVA_UTIL_STREAM_INT_STREAM)) {
       return PsiType.INT;
     }
-    if (InheritanceUtil.isInheritor(aClass, false, JavaClassNames.JAVA_UTIL_STREAM_LONG_STREAM)) {
+    if (InheritanceUtil.isInheritor(aClass, false, CommonClassNames.JAVA_UTIL_STREAM_LONG_STREAM)) {
       return PsiType.LONG;
     }
-    if (InheritanceUtil.isInheritor(aClass, false, JavaClassNames.JAVA_UTIL_STREAM_DOUBLE_STREAM)) {
+    if (InheritanceUtil.isInheritor(aClass, false, CommonClassNames.JAVA_UTIL_STREAM_DOUBLE_STREAM)) {
       return PsiType.DOUBLE;
     }
-    if (!InheritanceUtil.isInheritor(aClass, false, JavaClassNames.JAVA_UTIL_STREAM_STREAM)) {
+    if (!InheritanceUtil.isInheritor(aClass, false, CommonClassNames.JAVA_UTIL_STREAM_STREAM)) {
       return null;
     }
-    PsiType streamType = PsiUtil.substituteTypeParameter(type, JavaClassNames.JAVA_UTIL_STREAM_STREAM, 0, false);
+    PsiType streamType = PsiUtil.substituteTypeParameter(type, CommonClassNames.JAVA_UTIL_STREAM_STREAM, 0, false);
     if (variableType) {
       if (streamType instanceof PsiIntersectionType) {
         return null;

diff --git a/java-analysis-impl/testsrc/com/siyeh/ig/imports/StaticImportInspectionTest.java b/java-analysis-impl/testsrc/com/siyeh/ig/imports/StaticImportInspectionTest.java
@@ -1,13 +1,13 @@
 package com.siyeh.ig.imports;
 
+import com.intellij.java.language.psi.CommonClassNames;
 import com.siyeh.ig.IGInspectionTestCase;
-import consulo.java.language.module.util.JavaClassNames;
 
 public class StaticImportInspectionTest extends IGInspectionTestCase {
 
   public void test() throws Exception {
     final StaticImportInspection tool = new StaticImportInspection();
-    tool.allowedClasses.add(JavaClassNames.JAVA_UTIL_MAP);
+    tool.allowedClasses.add(CommonClassNames.JAVA_UTIL_MAP);
     doTest("com/siyeh/igtest/imports/static_import", tool);
   }
 

diff --git a/...ugger-impl/src/main/java/com/intellij/java/debugger/impl/memory/utils/StackFrameItem.java b/...ugger-impl/src/main/java/com/intellij/java/debugger/impl/memory/utils/StackFrameItem.java
@@ -26,14 +26,14 @@
 import com.intellij.java.debugger.impl.settings.NodeRendererSettings;
 import com.intellij.java.debugger.impl.ui.breakpoints.StackCapturingLineBreakpoint;
 import com.intellij.java.debugger.impl.ui.tree.render.ClassRenderer;
+import com.intellij.java.language.psi.CommonClassNames;
 import consulo.execution.debug.XSourcePosition;
 import consulo.execution.debug.frame.*;
 import consulo.execution.debug.frame.presentation.XStringValuePresentation;
 import consulo.execution.debug.icon.ExecutionDebugIconGroup;
 import consulo.execution.debug.ui.XDebuggerUIConstants;
 import consulo.ide.setting.ShowSettingsUtil;
 import consulo.internal.com.sun.jdi.*;
-import consulo.java.language.module.util.JavaClassNames;
 import consulo.logging.Logger;
 import consulo.platform.base.icon.PlatformIconGroup;
 import consulo.ui.ex.ColoredTextContainer;
@@ -194,7 +194,7 @@ public void computePresentation(@Nonnull XValueNode node, @Nonnull XValuePlace p
       ClassRenderer classRenderer = NodeRendererSettings.getInstance().getClassRenderer();
       String type = classRenderer.renderTypeName(myType);
       Image icon = myVarType == VariableItem.VarType.PARAM ? PlatformIconGroup.nodesParameter() : ExecutionDebugIconGroup.nodeValue();
-      if (myType != null && myType.startsWith(JavaClassNames.JAVA_LANG_STRING + "@")) {
+      if (myType != null && myType.startsWith(CommonClassNames.JAVA_LANG_STRING + "@")) {
         node.setPresentation(icon, new XStringValuePresentation(myValue) {
           @Nullable
           @Override

diff --git a/...ge/impl/psi/impl/source/resolve/graphInference/constraints/StrictSubtypingConstraint.java b/...ge/impl/psi/impl/source/resolve/graphInference/constraints/StrictSubtypingConstraint.java
@@ -15,17 +15,16 @@
  */
 package com.intellij.java.language.impl.psi.impl.source.resolve.graphInference.constraints;
 
-import java.util.HashSet;
-import java.util.List;
-
-import com.intellij.java.language.psi.*;
 import com.intellij.java.language.impl.psi.impl.source.resolve.graphInference.InferenceBound;
 import com.intellij.java.language.impl.psi.impl.source.resolve.graphInference.InferenceSession;
 import com.intellij.java.language.impl.psi.impl.source.resolve.graphInference.InferenceVariable;
+import com.intellij.java.language.psi.*;
 import com.intellij.java.language.psi.util.InheritanceUtil;
 import com.intellij.java.language.psi.util.PsiUtil;
 import com.intellij.java.language.psi.util.TypeConversionUtil;
-import consulo.java.language.module.util.JavaClassNames;
+
+import java.util.HashSet;
+import java.util.List;
 
 /**
  * User: anna
@@ -68,7 +67,7 @@ private boolean doReduce(InferenceSession session, HashSet<InferenceVariable> de
 		{
 			if(myT == null)
 			{
-				return myS == null || myS.equalsToText(JavaClassNames.JAVA_LANG_OBJECT);
+				return myS == null || myS.equalsToText(CommonClassNames.JAVA_LANG_OBJECT);
 			}
 			if(myS == null)
 			{
@@ -81,7 +80,7 @@ private boolean doReduce(InferenceSession session, HashSet<InferenceVariable> de
 		{
 			return false;
 		}
-		if(PsiType.NULL.equals(myS) || myS == null || myT.equalsToText(JavaClassNames.JAVA_LANG_OBJECT))
+		if(PsiType.NULL.equals(myS) || myS == null || myT.equalsToText(CommonClassNames.JAVA_LANG_OBJECT))
 		{
 			return true;
 		}

diff --git a/.../impl/codeInsight/daemon/impl/quickfix/SurroundWithQuotesAnnotationParameterValueFix.java b/.../impl/codeInsight/daemon/impl/quickfix/SurroundWithQuotesAnnotationParameterValueFix.java
@@ -17,7 +17,6 @@
 
 import com.intellij.java.language.psi.*;
 import consulo.codeEditor.Editor;
-import consulo.java.language.module.util.JavaClassNames;
 import consulo.language.editor.intention.SyntheticIntentionAction;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.PsiFile;
@@ -45,7 +44,7 @@ public boolean isAvailable(@Nonnull Project project, Editor editor, PsiFile file
       return false;
     }
     final PsiClass resolvedType = ((PsiClassType)myExpectedType).resolve();
-    return resolvedType != null && JavaClassNames.JAVA_LANG_STRING.equals(resolvedType.getQualifiedName()) &&
+    return resolvedType != null && CommonClassNames.JAVA_LANG_STRING.equals(resolvedType.getQualifiedName()) &&
       myValue instanceof PsiLiteralExpression;
   }
 

diff --git a/...n/java/com/intellij/java/impl/codeInsight/intention/impl/SurroundAutoCloseableAction.java b/...n/java/com/intellij/java/impl/codeInsight/intention/impl/SurroundAutoCloseableAction.java
@@ -23,7 +23,6 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.codeEditor.Editor;
-import consulo.java.language.module.util.JavaClassNames;
 import consulo.language.codeStyle.CodeStyleManager;
 import consulo.language.editor.intention.IntentionMetaData;
 import consulo.language.editor.intention.PsiElementBaseIntentionAction;
@@ -64,8 +63,10 @@ public boolean isAvailable(@Nonnull final Project project, final Editor editor,
     if (!(type instanceof PsiClassType)) return false;
     final PsiClass aClass = ((PsiClassType)type).resolve();
     final JavaPsiFacade facade = JavaPsiFacade.getInstance(project);
-    final PsiClass autoCloseable =
-      facade.findClass(JavaClassNames.JAVA_LANG_AUTO_CLOSEABLE, (GlobalSearchScope) ProjectScopes.getLibrariesScope(project));
+    final PsiClass autoCloseable = facade.findClass(
+        CommonClassNames.JAVA_LANG_AUTO_CLOSEABLE,
+        (GlobalSearchScope) ProjectScopes.getLibrariesScope(project)
+    );
     return InheritanceUtil.isInheritorOrSelf(aClass, autoCloseable, true);
   }
 

diff --git a/plugin/src/main/java/com/intellij/java/impl/codeInspection/StreamFilterNotNullFix.java b/plugin/src/main/java/com/intellij/java/impl/codeInspection/StreamFilterNotNullFix.java
@@ -122,7 +122,7 @@ public static StreamFilterNotNullFix makeFix(PsiElement reference) {
       return null;
     }
     PsiExpression qualifier = call.getMethodExpression().getQualifierExpression();
-    if (qualifier == null || !InheritanceUtil.isInheritor(qualifier.getType(), JavaClassNames.JAVA_UTIL_STREAM_STREAM)) {
+    if (qualifier == null || !InheritanceUtil.isInheritor(qualifier.getType(), CommonClassNames.JAVA_UTIL_STREAM_STREAM)) {
       return null;
     }
     return new StreamFilterNotNullFix();

diff --git a/...java/impl/codeInspection/inheritance/SuperClassHasFrequentlyUsedInheritorsInspection.java b/...java/impl/codeInspection/inheritance/SuperClassHasFrequentlyUsedInheritorsInspection.java
@@ -5,16 +5,15 @@
 import com.intellij.java.impl.codeInspection.inheritance.search.InheritorsStatisticsSearchResult;
 import com.intellij.java.language.psi.*;
 import consulo.annotation.component.ExtensionImpl;
-import consulo.java.language.module.util.JavaClassNames;
 import consulo.language.editor.inspection.LocalQuickFix;
 import consulo.language.editor.inspection.ProblemDescriptor;
 import consulo.language.editor.inspection.ProblemHighlightType;
 import consulo.language.editor.inspection.localize.InspectionLocalize;
 import consulo.language.editor.inspection.scheme.InspectionManager;
-import org.jetbrains.annotations.Nls;
-
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
+import org.jetbrains.annotations.Nls;
+
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
@@ -100,9 +99,9 @@ private static PsiClass getSuperIfUnique(final @Nonnull PsiClass aClass) {
       final PsiJavaCodeReferenceElement[] referenceElements = extendsList.getReferenceElements();
       if (referenceElements.length == 1) {
         PsiClass returnClass = (PsiClass)referenceElements[0].resolve();
-        if (returnClass != null &&
-            !JavaClassNames.JAVA_LANG_OBJECT.equals(returnClass.getQualifiedName()) &&
-            !returnClass.isInterface()) {
+        if (returnClass != null
+            && !CommonClassNames.JAVA_LANG_OBJECT.equals(returnClass.getQualifiedName())
+            && !returnClass.isInterface()) {
           return returnClass;
         }
       }

diff --git a/...c/main/java/com/intellij/java/impl/ide/hierarchy/type/SubtypesHierarchyTreeStructure.java b/...c/main/java/com/intellij/java/impl/ide/hierarchy/type/SubtypesHierarchyTreeStructure.java
@@ -17,13 +17,13 @@
 
 import com.intellij.java.indexing.search.searches.ClassInheritorsSearch;
 import com.intellij.java.indexing.search.searches.FunctionalExpressionSearch;
+import com.intellij.java.language.psi.CommonClassNames;
 import com.intellij.java.language.psi.PsiAnonymousClass;
 import com.intellij.java.language.psi.PsiClass;
 import consulo.content.scope.SearchScope;
 import consulo.ide.impl.idea.ide.hierarchy.HierarchyNodeDescriptor;
 import consulo.ide.impl.idea.ide.hierarchy.HierarchyTreeStructure;
 import consulo.ide.localize.IdeLocalize;
-import consulo.java.language.module.util.JavaClassNames;
 import consulo.project.Project;
 import consulo.util.collection.ArrayUtil;
 import jakarta.annotation.Nonnull;
@@ -51,7 +51,7 @@ protected final Object[] buildChildren(@Nonnull HierarchyNodeDescriptor descript
         if (!(element instanceof PsiClass psiClass)) {
             return ArrayUtil.EMPTY_OBJECT_ARRAY;
         }
-        if (JavaClassNames.JAVA_LANG_OBJECT.equals(psiClass.getQualifiedName())) {
+        if (CommonClassNames.JAVA_LANG_OBJECT.equals(psiClass.getQualifiedName())) {
             return new Object[]{IdeLocalize.nodeHierarchyJavaLangObject().get()};
         }
         if (psiClass instanceof PsiAnonymousClass) {

diff --git a/...main/java/com/intellij/java/impl/ide/hierarchy/type/SupertypesHierarchyTreeStructure.java b/...main/java/com/intellij/java/impl/ide/hierarchy/type/SupertypesHierarchyTreeStructure.java
@@ -15,20 +15,19 @@
  */
 package com.intellij.java.impl.ide.hierarchy.type;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import jakarta.annotation.Nonnull;
-
-import consulo.ide.impl.idea.ide.hierarchy.HierarchyNodeDescriptor;
-import consulo.ide.impl.idea.ide.hierarchy.HierarchyTreeStructure;
-import consulo.project.Project;
-import consulo.java.language.module.util.JavaClassNames;
+import com.intellij.java.language.psi.CommonClassNames;
 import com.intellij.java.language.psi.JavaPsiFacade;
 import com.intellij.java.language.psi.PsiClass;
 import com.intellij.java.language.psi.PsiFunctionalExpression;
 import com.intellij.java.language.psi.util.PsiUtil;
+import consulo.ide.impl.idea.ide.hierarchy.HierarchyNodeDescriptor;
+import consulo.ide.impl.idea.ide.hierarchy.HierarchyTreeStructure;
+import consulo.project.Project;
 import consulo.util.collection.ArrayUtil;
+import jakarta.annotation.Nonnull;
+
+import java.util.ArrayList;
+import java.util.List;
 
 public final class SupertypesHierarchyTreeStructure extends HierarchyTreeStructure {
     public SupertypesHierarchyTreeStructure(Project project, PsiClass aClass) {
@@ -43,7 +42,7 @@ protected final Object[] buildChildren(@Nonnull HierarchyNodeDescriptor descript
             PsiClass[] supers = psiClass.getSupers();
             List<HierarchyNodeDescriptor> descriptors = new ArrayList<>();
             PsiClass objectClass =
-                JavaPsiFacade.getInstance(myProject).findClass(JavaClassNames.JAVA_LANG_OBJECT, psiClass.getResolveScope());
+                JavaPsiFacade.getInstance(myProject).findClass(CommonClassNames.JAVA_LANG_OBJECT, psiClass.getResolveScope());
             for (PsiClass aSuper : supers) {
                 if (!psiClass.isInterface() || !aSuper.equals(objectClass)) {
                     descriptors.add(new TypeHierarchyNodeDescriptor(myProject, descriptor, aSuper, false));

diff --git a/...java/com/intellij/java/impl/ig/bugs/StringConcatenationInMessageFormatCallInspection.java b/...java/com/intellij/java/impl/ig/bugs/StringConcatenationInMessageFormatCallInspection.java
@@ -25,7 +25,6 @@
 import com.siyeh.ig.psiutils.ExpressionUtils;
 import com.siyeh.localize.InspectionGadgetsLocalize;
 import consulo.annotation.component.ExtensionImpl;
-import consulo.java.language.module.util.JavaClassNames;
 import consulo.language.editor.inspection.ProblemDescriptor;
 import consulo.language.psi.PsiElement;
 import consulo.language.util.IncorrectOperationException;
@@ -171,7 +170,7 @@ public void visitMethodCallExpression(PsiMethodCallExpression expression) {
       }
       final PsiExpression formatArgument = arguments[formatArgumentIndex];
       final PsiType formatArgumentType = formatArgument.getType();
-      if (formatArgumentType == null || !formatArgumentType.equalsToText(JavaClassNames.JAVA_LANG_STRING)) {
+      if (formatArgumentType == null || !formatArgumentType.equalsToText(CommonClassNames.JAVA_LANG_STRING)) {
         return;
       }
       if (!(formatArgument instanceof PsiBinaryExpression)) {
@@ -183,7 +182,7 @@ public void visitMethodCallExpression(PsiMethodCallExpression expression) {
       final PsiBinaryExpression binaryExpression = (PsiBinaryExpression)formatArgument;
       final PsiExpression lhs = binaryExpression.getLOperand();
       final PsiType lhsType = lhs.getType();
-      if (lhsType == null || !lhsType.equalsToText(JavaClassNames.JAVA_LANG_STRING)) {
+      if (lhsType == null || !lhsType.equalsToText(CommonClassNames.JAVA_LANG_STRING)) {
         return;
       }
       final PsiExpression rhs = binaryExpression.getROperand();

diff --git a/...c/main/java/com/intellij/java/impl/ig/internationalization/StringCompareToInspection.java b/...c/main/java/com/intellij/java/impl/ig/internationalization/StringCompareToInspection.java
@@ -15,19 +15,18 @@
  */
 package com.intellij.java.impl.ig.internationalization;
 
-import com.intellij.java.language.codeInsight.AnnotationUtil;
 import com.intellij.java.analysis.impl.codeInsight.intention.AddAnnotationFix;
+import com.intellij.java.impl.ig.DelegatingFix;
+import com.intellij.java.language.codeInsight.AnnotationUtil;
 import com.intellij.java.language.psi.*;
 import com.siyeh.HardcodedMethodConstants;
 import com.siyeh.InspectionGadgetsBundle;
 import com.siyeh.ig.BaseInspection;
 import com.siyeh.ig.BaseInspectionVisitor;
-import com.intellij.java.impl.ig.DelegatingFix;
 import com.siyeh.ig.InspectionGadgetsFix;
 import com.siyeh.ig.psiutils.MethodUtils;
 import com.siyeh.ig.psiutils.TypeUtils;
 import consulo.annotation.component.ExtensionImpl;
-import consulo.java.language.module.util.JavaClassNames;
 import jakarta.annotation.Nonnull;
 
 import java.util.ArrayList;
@@ -144,7 +143,7 @@ private static boolean isStringCompareTo(
         return false;
       }
       final String className = aClass.getQualifiedName();
-      return JavaClassNames.JAVA_LANG_STRING.equals(className);
+      return CommonClassNames.JAVA_LANG_STRING.equals(className);
     }
   }
 }