consulo · VISTALL · May 10, 2025 · May 9, 2025
diff --git a/...n/java/com/intellij/java/analysis/impl/codeInsight/DefaultInferredAnnotationProvider.java b/...n/java/com/intellij/java/analysis/impl/codeInsight/DefaultInferredAnnotationProvider.java
@@ -12,19 +12,17 @@
 import com.intellij.java.language.psi.util.PsiUtil;
 import com.siyeh.ig.callMatcher.CallMatcher;
 import consulo.annotation.component.ExtensionImpl;
-import consulo.java.language.module.util.JavaClassNames;
 import consulo.language.psi.PsiElement;
 import consulo.project.Project;
 import consulo.util.collection.ContainerUtil;
 import consulo.util.lang.StringUtil;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 import jakarta.inject.Inject;
 import one.util.streamex.EntryStream;
 import one.util.streamex.StreamEx;
 import org.jetbrains.annotations.Contract;
 
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
-
 import java.util.*;
 
 import static com.intellij.java.analysis.impl.codeInspection.dataFlow.JavaMethodContractUtil.ORG_JETBRAINS_ANNOTATIONS_CONTRACT;
@@ -44,9 +42,9 @@ public class DefaultInferredAnnotationProvider implements InferredAnnotationProv
     // Could be added via external annotations, but there are many signatures to handle
     // and we have troubles supporting external annotations for JDK 9+
     private static final CallMatcher IMMUTABLE_FACTORY = CallMatcher.anyOf(
-        CallMatcher.staticCall(JavaClassNames.JAVA_UTIL_LIST, "of", "copyOf"),
-        CallMatcher.staticCall(JavaClassNames.JAVA_UTIL_SET, "of", "copyOf"),
-        CallMatcher.staticCall(JavaClassNames.JAVA_UTIL_MAP, "of", "ofEntries", "copyOf", "entry")
+        CallMatcher.staticCall(CommonClassNames.JAVA_UTIL_LIST, "of", "copyOf"),
+        CallMatcher.staticCall(CommonClassNames.JAVA_UTIL_SET, "of", "copyOf"),
+        CallMatcher.staticCall(CommonClassNames.JAVA_UTIL_MAP, "of", "ofEntries", "copyOf", "entry")
     );
     private final NullableNotNullManager myNullabilityManager;
 
@@ -213,10 +211,10 @@ private PsiAnnotation getInferredNullabilityAnnotation(PsiParameter parameter) {
             PsiClass containingClass = method.getContainingClass();
             if (containingClass != null) {
                 String className = containingClass.getQualifiedName();
-                if (JavaClassNames.JAVA_UTIL_LIST.equals(className)
-                    || JavaClassNames.JAVA_UTIL_SET.equals(className)
-                    || JavaClassNames.JAVA_UTIL_MAP.equals(className)
-                    || JavaClassNames.JAVA_UTIL_ENUM_SET.equals(className)) {
+                if (CommonClassNames.JAVA_UTIL_LIST.equals(className)
+                    || CommonClassNames.JAVA_UTIL_SET.equals(className)
+                    || CommonClassNames.JAVA_UTIL_MAP.equals(className)
+                    || CommonClassNames.JAVA_UTIL_ENUM_SET.equals(className)) {
                     return ProjectBytecodeAnalysis.getInstance(myProject).getNotNullAnnotation();
                 }
             }

diff --git a/...in/java/com/intellij/java/analysis/impl/codeInspection/dataFlow/CustomMethodHandlers.java b/...in/java/com/intellij/java/analysis/impl/codeInspection/dataFlow/CustomMethodHandlers.java
@@ -18,15 +18,13 @@
 import com.siyeh.ig.callMatcher.CallMatcher;
 import com.siyeh.ig.psiutils.TypeUtils;
 import consulo.application.util.CachedValueProvider;
-import consulo.java.language.module.util.JavaClassNames;
 import consulo.language.psi.util.LanguageCachedValueUtil;
 import consulo.util.collection.ArrayUtil;
 import consulo.util.lang.reflect.ReflectionUtil;
+import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 import org.jetbrains.annotations.Contract;
 
-import jakarta.annotation.Nonnull;
-
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
@@ -51,7 +49,7 @@ final class CustomMethodHandlers {
       staticCall(JAVA_LANG_FLOAT, "toString", "toHexString").parameterTypes("float"),
       staticCall(JAVA_LANG_BYTE, "toString").parameterTypes("byte"),
       staticCall(JAVA_LANG_SHORT, "toString").parameterTypes("short"),
-      staticCall(JAVA_LANG_BOOLEAN, "parseBoolean").parameterTypes(JavaClassNames.JAVA_LANG_STRING),
+      staticCall(JAVA_LANG_BOOLEAN, "parseBoolean").parameterTypes(CommonClassNames.JAVA_LANG_STRING),
       staticCall(JAVA_LANG_INTEGER, "compare", "compareUnsigned").parameterTypes("int", "int"),
       staticCall(JAVA_LANG_LONG, "compare", "compareUnsigned").parameterTypes("long", "long"),
       staticCall(JAVA_LANG_DOUBLE, "compare").parameterTypes("double", "double"),

diff --git a/.../java/com/intellij/java/analysis/impl/codeInspection/dataFlow/DataFlowInspectionBase.java b/.../java/com/intellij/java/analysis/impl/codeInspection/dataFlow/DataFlowInspectionBase.java
@@ -32,7 +32,6 @@
 import consulo.application.util.registry.Registry;
 import consulo.document.util.TextRange;
 import consulo.java.analysis.localize.JavaAnalysisLocalize;
-import consulo.java.language.module.util.JavaClassNames;
 import consulo.language.ast.IElementType;
 import consulo.language.editor.inspection.*;
 import consulo.language.editor.inspection.localize.InspectionLocalize;
@@ -1112,7 +1111,7 @@ private static boolean shouldBeSuppressed(PsiElement anchor) {
             && TRUE_OR_FALSE.contains(ref.getReferenceName())
             && ref.resolve() instanceof PsiField field) {
             PsiClass containingClass = field.getContainingClass();
-            if (containingClass != null && JavaClassNames.JAVA_LANG_BOOLEAN.equals(containingClass.getQualifiedName())) {
+            if (containingClass != null && CommonClassNames.JAVA_LANG_BOOLEAN.equals(containingClass.getQualifiedName())) {
                 return true;
             }
         }
@@ -1133,7 +1132,7 @@ private static boolean shouldBeSuppressed(PsiElement anchor) {
         }
         // We assume all Void variables as null because you cannot instantiate it without dirty hacks
         // However reporting them as "always null" looks redundant (dereferences or comparisons will be reported though).
-        if (TypeUtils.typeEquals(JavaClassNames.JAVA_LANG_VOID, expression.getType())) {
+        if (TypeUtils.typeEquals(CommonClassNames.JAVA_LANG_VOID, expression.getType())) {
             return true;
         }
         if (isFlagCheck(anchor)) {
@@ -1257,7 +1256,7 @@ private void reportNullableReturns(
         }
 
         // no warnings for Void methods, where only null can be possibly returned
-        if (returnType == null || returnType.equalsToText(JavaClassNames.JAVA_LANG_VOID)) {
+        if (returnType == null || returnType.equalsToText(CommonClassNames.JAVA_LANG_VOID)) {
             return;
         }
 

diff --git a/...a/com/intellij/java/analysis/impl/codeInspection/dataFlow/DataFlowInstructionVisitor.java b/...a/com/intellij/java/analysis/impl/codeInspection/dataFlow/DataFlowInstructionVisitor.java
@@ -17,7 +17,6 @@
 import consulo.annotation.access.RequiredReadAction;
 import consulo.application.Application;
 import consulo.document.util.TextRange;
-import consulo.java.language.module.util.JavaClassNames;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.util.PsiTreeUtil;
 import consulo.logging.Logger;
@@ -55,12 +54,12 @@ final class DataFlowInstructionVisitor extends StandardInstructionVisitor {
     private final List<DfaMemoryState> myEndOfInitializerStates = new ArrayList<>();
 
     private static final CallMatcher USELESS_SAME_ARGUMENTS = CallMatcher.anyOf(
-        CallMatcher.staticCall(JavaClassNames.JAVA_LANG_MATH, "min", "max").parameterCount(2),
-        CallMatcher.staticCall(JavaClassNames.JAVA_LANG_INTEGER, "min", "max").parameterCount(2),
-        CallMatcher.staticCall(JavaClassNames.JAVA_LANG_LONG, "min", "max").parameterCount(2),
-        CallMatcher.staticCall(JavaClassNames.JAVA_LANG_FLOAT, "min", "max").parameterCount(2),
-        CallMatcher.staticCall(JavaClassNames.JAVA_LANG_DOUBLE, "min", "max").parameterCount(2),
-        CallMatcher.instanceCall(JavaClassNames.JAVA_LANG_STRING, "replace").parameterCount(2)
+        CallMatcher.staticCall(CommonClassNames.JAVA_LANG_MATH, "min", "max").parameterCount(2),
+        CallMatcher.staticCall(CommonClassNames.JAVA_LANG_INTEGER, "min", "max").parameterCount(2),
+        CallMatcher.staticCall(CommonClassNames.JAVA_LANG_LONG, "min", "max").parameterCount(2),
+        CallMatcher.staticCall(CommonClassNames.JAVA_LANG_FLOAT, "min", "max").parameterCount(2),
+        CallMatcher.staticCall(CommonClassNames.JAVA_LANG_DOUBLE, "min", "max").parameterCount(2),
+        CallMatcher.instanceCall(CommonClassNames.JAVA_LANG_STRING, "replace").parameterCount(2)
     );
 
     @Override

diff --git a/...main/java/com/intellij/java/analysis/impl/codeInspection/dataFlow/DfaOptionalSupport.java b/...main/java/com/intellij/java/analysis/impl/codeInspection/dataFlow/DfaOptionalSupport.java
@@ -8,7 +8,6 @@
 import com.intellij.java.language.psi.util.PsiUtil;
 import com.siyeh.ig.psiutils.ExpressionUtils;
 import consulo.annotation.access.RequiredReadAction;
-import consulo.java.language.module.util.JavaClassNames;
 import consulo.language.editor.inspection.LocalQuickFix;
 import consulo.language.editor.inspection.ProblemDescriptor;
 import consulo.language.editor.localize.CommonQuickFixLocalize;
@@ -29,7 +28,7 @@ public static LocalQuickFix registerReplaceOptionalOfWithOfNullableFix(@Nonnull
         PsiClass containingClass = method == null ? null : method.getContainingClass();
         if (containingClass != null && "of".equals(method.getName())) {
             String qualifiedName = containingClass.getQualifiedName();
-            if (JavaClassNames.JAVA_UTIL_OPTIONAL.equals(qualifiedName)) {
+            if (CommonClassNames.JAVA_UTIL_OPTIONAL.equals(qualifiedName)) {
                 return new ReplaceOptionalCallFix("ofNullable", false);
             }
             if (OptionalUtil.GUAVA_OPTIONAL.equals(qualifiedName)) {

diff --git a/...a/com/intellij/java/analysis/impl/codeInspection/dataFlow/value/DfaExpressionFactory.java b/...a/com/intellij/java/analysis/impl/codeInspection/dataFlow/value/DfaExpressionFactory.java
@@ -19,15 +19,13 @@
 import com.siyeh.ig.psiutils.ClassUtils;
 import com.siyeh.ig.psiutils.ExpressionUtils;
 import consulo.annotation.access.RequiredReadAction;
-import consulo.java.language.module.util.JavaClassNames;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.util.PsiTreeUtil;
 import consulo.util.lang.ObjectUtil;
-import one.util.streamex.LongStreamEx;
-import org.jetbrains.annotations.Contract;
-
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
+import one.util.streamex.LongStreamEx;
+import org.jetbrains.annotations.Contract;
 
 import java.util.HashMap;
 import java.util.List;
@@ -439,13 +437,13 @@ public boolean equals(Object obj) {
 
     public static final class GetterDescriptor implements VariableDescriptor {
         private static final CallMatcher STABLE_METHODS = CallMatcher.anyOf(
-            CallMatcher.instanceCall(JavaClassNames.JAVA_LANG_OBJECT, "getClass").parameterCount(0),
+            CallMatcher.instanceCall(CommonClassNames.JAVA_LANG_OBJECT, "getClass").parameterCount(0),
             CallMatcher.instanceCall("java.lang.reflect.Member", "getName", "getModifiers", "getDeclaringClass", "isSynthetic"),
             CallMatcher.instanceCall("java.lang.reflect.Executable", "getParameterCount", "isVarArgs"),
             CallMatcher.instanceCall("java.lang.reflect.Field", "getType"),
             CallMatcher.instanceCall("java.lang.reflect.Method", "getReturnType"),
             CallMatcher.instanceCall(
-                JavaClassNames.JAVA_LANG_CLASS,
+                CommonClassNames.JAVA_LANG_CLASS,
                 "getName",
                 "isInterface",
                 "isArray",

diff --git a/...n/java/com/intellij/java/analysis/impl/codeInspection/dataFlow/value/DfaValueFactory.java b/...n/java/com/intellij/java/analysis/impl/codeInspection/dataFlow/value/DfaValueFactory.java
@@ -16,7 +16,6 @@
 import com.siyeh.ig.psiutils.ExpressionUtils;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.application.util.CachedValueProvider;
-import consulo.java.language.module.util.JavaClassNames;
 import consulo.language.pattern.ElementPattern;
 import consulo.language.psi.PsiCompiledElement;
 import consulo.language.psi.PsiElement;
@@ -217,7 +216,7 @@ private static Boolean computeJavaLangBooleanFieldReference(PsiVariable variable
             return null;
         }
         PsiClass psiClass = field.getContainingClass();
-        if (psiClass == null || !JavaClassNames.JAVA_LANG_BOOLEAN.equals(psiClass.getQualifiedName())) {
+        if (psiClass == null || !CommonClassNames.JAVA_LANG_BOOLEAN.equals(psiClass.getQualifiedName())) {
             return null;
         }
         String name = variable.getName();
@@ -292,7 +291,7 @@ public DfaValue createCommonValue(@Nonnull PsiExpression[] expressions, PsiType
 
     private static class ClassInitializationInfo {
         private static final CallMatcher SAFE_CALLS =
-            CallMatcher.staticCall(JavaClassNames.JAVA_UTIL_OBJECTS, "requireNonNull");
+            CallMatcher.staticCall(CommonClassNames.JAVA_UTIL_OBJECTS, "requireNonNull");
 
         final boolean myCanInstantiateItself;
         final boolean myCtorsCallMethods;

diff --git a/...a/com/intellij/java/analysis/impl/codeInspection/equalsAndHashcode/EqualsAndHashcode.java b/...a/com/intellij/java/analysis/impl/codeInspection/equalsAndHashcode/EqualsAndHashcode.java
@@ -19,11 +19,9 @@
 import com.intellij.java.language.psi.*;
 import com.intellij.java.language.psi.util.MethodSignatureUtil;
 import consulo.annotation.component.ExtensionImpl;
-import consulo.application.ApplicationManager;
 import consulo.application.util.CachedValueProvider;
 import consulo.application.util.CachedValuesManager;
 import consulo.application.util.function.Computable;
-import consulo.java.language.module.util.JavaClassNames;
 import consulo.language.editor.inspection.LocalInspectionToolSession;
 import consulo.language.editor.inspection.LocalQuickFix;
 import consulo.language.editor.inspection.ProblemsHolder;
@@ -58,7 +56,7 @@ public PsiElementVisitor buildVisitorImpl(
             @Override
             @Nullable
             public PsiClass compute() {
-              return psiFacade.findClass(JavaClassNames.JAVA_LANG_OBJECT, GlobalSearchScope.allScope(project));
+              return psiFacade.findClass(CommonClassNames.JAVA_LANG_OBJECT, GlobalSearchScope.allScope(project));
             }
           }
       );

diff --git a/...-impl/src/main/java/com/siyeh/ig/inheritance/ExtendsConcreteCollectionInspectionBase.java b/...-impl/src/main/java/com/siyeh/ig/inheritance/ExtendsConcreteCollectionInspectionBase.java
@@ -21,7 +21,6 @@
 import com.siyeh.ig.psiutils.CollectionUtils;
 import com.siyeh.ig.psiutils.TypeUtils;
 import com.siyeh.localize.InspectionGadgetsLocalize;
-import consulo.java.language.module.util.JavaClassNames;
 import jakarta.annotation.Nonnull;
 
 public abstract class ExtendsConcreteCollectionInspectionBase extends BaseInspection {
@@ -65,7 +64,7 @@ public void visitClass(@Nonnull PsiClass aClass) {
       final String qualifiedName = superClass.getQualifiedName();
       if ("java.util.LinkedHashMap".equals(qualifiedName)) {
         final PsiMethod[] methods = aClass.findMethodsByName("removeEldestEntry", false);
-        final PsiClassType entryType = TypeUtils.getType(JavaClassNames.JAVA_UTIL_MAP_ENTRY, aClass);
+        final PsiClassType entryType = TypeUtils.getType(CommonClassNames.JAVA_UTIL_MAP_ENTRY, aClass);
         for (PsiMethod method : methods) {
           if (!PsiType.BOOLEAN.equals(method.getReturnType())) {
             continue;

diff --git a/java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/EqualityCheck.java b/java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/EqualityCheck.java
@@ -1,25 +1,20 @@
 // Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package com.siyeh.ig.psiutils;
 
-import com.intellij.java.language.psi.PsiConditionalExpression;
-import com.intellij.java.language.psi.PsiExpression;
-import com.intellij.java.language.psi.PsiMethodCallExpression;
-import com.intellij.java.language.psi.PsiReferenceExpression;
+import com.intellij.java.language.psi.*;
 import com.intellij.java.language.psi.util.PsiUtil;
 import com.siyeh.ig.callMatcher.CallMatcher;
-import consulo.java.language.module.util.JavaClassNames;
 import consulo.util.collection.ArrayUtil;
+import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 import org.jetbrains.annotations.Contract;
 
-import jakarta.annotation.Nonnull;
-
 /**
  * Represents a model of PsiExpression which checks whether two expressions are equal (via Object.equals directly or indirectly).
  */
 public class EqualityCheck {
   private static final CallMatcher OBJECT_EQUALS = CallMatcher.anyOf(
-      CallMatcher.staticCall(JavaClassNames.JAVA_UTIL_OBJECTS, "equals").parameterCount(2),
+      CallMatcher.staticCall(CommonClassNames.JAVA_UTIL_OBJECTS, "equals").parameterCount(2),
       CallMatcher.staticCall("com.google.common.base.Objects", "equal").parameterCount(2));
   private final
   @Nonnull

diff --git a/java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/ExceptionUtils.java b/java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/ExceptionUtils.java
@@ -19,12 +19,11 @@
 import com.intellij.java.language.impl.refactoring.util.RefactoringChangeUtil;
 import com.intellij.java.language.psi.*;
 import com.intellij.java.language.psi.util.InheritanceUtil;
-import consulo.java.language.module.util.JavaClassNames;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.util.PsiTreeUtil;
-
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
+
 import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.Set;
@@ -37,10 +36,10 @@ private ExceptionUtils() {
   private static final Set<String> s_genericExceptionTypes = new HashSet<>(4);
 
   static {
-    s_genericExceptionTypes.add(JavaClassNames.JAVA_LANG_THROWABLE);
-    s_genericExceptionTypes.add(JavaClassNames.JAVA_LANG_EXCEPTION);
-    s_genericExceptionTypes.add(JavaClassNames.JAVA_LANG_RUNTIME_EXCEPTION);
-    s_genericExceptionTypes.add(JavaClassNames.JAVA_LANG_ERROR);
+    s_genericExceptionTypes.add(CommonClassNames.JAVA_LANG_THROWABLE);
+    s_genericExceptionTypes.add(CommonClassNames.JAVA_LANG_EXCEPTION);
+    s_genericExceptionTypes.add(CommonClassNames.JAVA_LANG_RUNTIME_EXCEPTION);
+    s_genericExceptionTypes.add(CommonClassNames.JAVA_LANG_ERROR);
   }
 
   @Nonnull
@@ -209,7 +208,7 @@ public static boolean isExceptionArgument(@Nonnull PsiExpression expression) {
     final PsiNewExpression newExpression = PsiTreeUtil.getParentOfType(expression, PsiNewExpression.class, true, PsiCodeBlock.class, PsiClass.class);
     if (newExpression != null) {
       final PsiType newExpressionType = newExpression.getType();
-      if (InheritanceUtil.isInheritor(newExpressionType, JavaClassNames.JAVA_LANG_THROWABLE)) {
+      if (InheritanceUtil.isInheritor(newExpressionType, CommonClassNames.JAVA_LANG_THROWABLE)) {
         return true;
       }
     } else {

diff --git a/java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/ExpectedTypeUtils.java b/java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/ExpectedTypeUtils.java
@@ -19,14 +19,12 @@
 import com.intellij.java.language.psi.*;
 import com.intellij.java.language.psi.util.PsiTypesUtil;
 import com.intellij.java.language.psi.util.TypeConversionUtil;
-import consulo.java.language.module.util.JavaClassNames;
 import consulo.language.ast.IElementType;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.PsiManager;
 import consulo.language.util.IncorrectOperationException;
 import consulo.project.Project;
 import consulo.util.collection.ArrayUtil;
-
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
@@ -291,7 +289,7 @@ public void visitForeachStatement(PsiForeachStatement statement) {
       }
       final PsiClassType classType = (PsiClassType) iteratedValueType;
       final PsiType[] parameters = classType.getParameters();
-      final PsiClass iterableClass = ClassUtils.findClass(JavaClassNames.JAVA_LANG_ITERABLE, statement);
+      final PsiClass iterableClass = ClassUtils.findClass(CommonClassNames.JAVA_LANG_ITERABLE, statement);
       if (iterableClass == null) {
         expectedType = null;
       } else {