Skip to content

Commit bf45a44

Browse files
VISTALLVISTALL
authored
Merge pull request #164 from unv-unv/java-class-names-update
Replacing strings with fully-qualified class names with JavaClassNames constant
2 parents 2c9fbef + 4b85576 commit bf45a44

125 files changed

Lines changed: 587 additions & 501 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/analysis/HighlightMethodUtil.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
import consulo.java.language.module.util.JavaClassNames;
4040
import consulo.language.editor.inspection.LocalQuickFixOnPsiElementAsIntentionAdapter;
4141
import consulo.language.editor.intention.IntentionAction;
42-
import consulo.language.editor.intention.QuickFixAction;
4342
import consulo.language.editor.intention.QuickFixActionRegistrar;
4443
import consulo.language.editor.intention.UnresolvedReferenceQuickFixProvider;
4544
import consulo.language.editor.localize.DaemonLocalize;

‎java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/analysis/HighlightUtil.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3398,7 +3398,7 @@ public static HighlightInfo.Builder checkMustBeThrowable(
33983398
return null;
33993399
}
34003400
PsiElementFactory factory = JavaPsiFacade.getInstance(context.getProject()).getElementFactory();
3401-
PsiClassType throwable = factory.createTypeByFQClassName("java.lang.Throwable", context.getResolveScope());
3401+
PsiClassType throwable = factory.createTypeByFQClassName(JavaClassNames.JAVA_LANG_THROWABLE, context.getResolveScope());
34023402
if (!TypeConversionUtil.isAssignable(throwable, type)) {
34033403
HighlightInfo.Builder hlBuilder = createIncompatibleTypeHighlightInfo(throwable, type, context.getTextRange(), 0);
34043404
if (addCastIntention && TypeConversionUtil.areTypesConvertible(type, throwable)

‎java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/analysis/JavaHighlightUtil.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@
3434
public class JavaHighlightUtil {
3535
public static boolean isSerializable(@Nonnull PsiClass aClass) {
3636
PsiManager manager = aClass.getManager();
37-
PsiClass serializableClass = JavaPsiFacade.getInstance(manager.getProject()).findClass("java.io.Serializable", aClass.getResolveScope());
37+
PsiClass serializableClass = JavaPsiFacade.getInstance(manager.getProject())
38+
.findClass(JavaClassNames.JAVA_IO_SERIALIZABLE, aClass.getResolveScope());
3839
return serializableClass != null && aClass.isInheritor(serializableClass, true);
3940
}
4041

‎java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/dataFlow/ControlFlowAnalyzer.java‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import com.intellij.java.language.psi.util.TypeConversionUtil;
2424
import com.siyeh.ig.callMatcher.CallMatcher;
2525
import com.siyeh.ig.psiutils.*;
26+
import consulo.java.language.module.util.JavaClassNames;
2627
import consulo.language.ast.IElementType;
2728
import consulo.language.editor.ImplicitUsageProvider;
2829
import consulo.language.psi.PsiElement;
@@ -1258,8 +1259,9 @@ public void visitArrayAccessExpression(PsiArrayAccessExpression expression) {
12581259
if (toPush == null) {
12591260
toPush = myFactory.getObjectType(expression.getType(), Nullability.UNKNOWN);
12601261
}
1261-
DfaControlTransferValue transfer =
1262-
shouldHandleException() ? myFactory.controlTransfer(myExceptionCache.get("java.lang.ArrayIndexOutOfBoundsException"), myTrapStack) : null;
1262+
DfaControlTransferValue transfer = shouldHandleException()
1263+
? myFactory.controlTransfer(myExceptionCache.get(JavaClassNames.JAVA_LANG_ARRAY_INDEX_OUT_OF_BOUNDS_EXCEPTION), myTrapStack)
1264+
: null;
12631265
addInstruction(new ArrayAccessInstruction(toPush, expression, transfer));
12641266
addNullCheck(expression);
12651267
finishElement(expression);
@@ -2022,8 +2024,9 @@ public void visitTypeCastExpression(PsiTypeCastExpression castExpression) {
20222024

20232025
final PsiTypeElement typeElement = castExpression.getCastType();
20242026
if (typeElement != null && operand != null && operand.getType() != null && !(typeElement.getType() instanceof PsiPrimitiveType)) {
2025-
DfaControlTransferValue transfer =
2026-
shouldHandleException() ? myFactory.controlTransfer(myExceptionCache.get("java.lang.ClassCastException"), myTrapStack) : null;
2027+
DfaControlTransferValue transfer = shouldHandleException()
2028+
? myFactory.controlTransfer(myExceptionCache.get(JavaClassNames.JAVA_LANG_CLASS_CAST_EXCEPTION), myTrapStack)
2029+
: null;
20272030
addInstruction(new TypeCastInstruction(castExpression, operand, typeElement.getType(), transfer));
20282031
}
20292032
finishElement(castExpression);

‎java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/dataFlow/CustomMethodHandlers.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import com.siyeh.ig.callMatcher.CallMatcher;
1919
import com.siyeh.ig.psiutils.TypeUtils;
2020
import consulo.application.util.CachedValueProvider;
21+
import consulo.java.language.module.util.JavaClassNames;
2122
import consulo.language.psi.util.LanguageCachedValueUtil;
2223
import consulo.util.collection.ArrayUtil;
2324
import consulo.util.lang.reflect.ReflectionUtil;
@@ -50,7 +51,7 @@ final class CustomMethodHandlers {
5051
staticCall(JAVA_LANG_FLOAT, "toString", "toHexString").parameterTypes("float"),
5152
staticCall(JAVA_LANG_BYTE, "toString").parameterTypes("byte"),
5253
staticCall(JAVA_LANG_SHORT, "toString").parameterTypes("short"),
53-
staticCall(JAVA_LANG_BOOLEAN, "parseBoolean").parameterTypes("java.lang.String"),
54+
staticCall(JAVA_LANG_BOOLEAN, "parseBoolean").parameterTypes(JavaClassNames.JAVA_LANG_STRING),
5455
staticCall(JAVA_LANG_INTEGER, "compare", "compareUnsigned").parameterTypes("int", "int"),
5556
staticCall(JAVA_LANG_LONG, "compare", "compareUnsigned").parameterTypes("long", "long"),
5657
staticCall(JAVA_LANG_DOUBLE, "compare").parameterTypes("double", "double"),

‎java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/dataFlow/HardcodedContracts.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import com.siyeh.ig.callMatcher.CallMatcher;
1111
import com.siyeh.ig.psiutils.MethodUtils;
1212
import com.siyeh.ig.psiutils.TypeUtils;
13+
import consulo.java.language.module.util.JavaClassNames;
1314
import consulo.language.inject.InjectedLanguageManager;
1415
import consulo.language.psi.PsiElement;
1516
import consulo.language.psi.PsiFile;
@@ -527,7 +528,7 @@ public static MutationSignature getHardcodedMutation(PsiMethod method) {
527528
}
528529
String name = method.getName();
529530

530-
if ("java.util.Objects".equals(className) && "requireNonNull".equals(name)) {
531+
if (JavaClassNames.JAVA_UTIL_OBJECTS.equals(className) && "requireNonNull".equals(name)) {
531532
PsiParameter[] parameters = method.getParameterList().getParameters();
532533
if (parameters.length == 2 && parameters[1].getType().getCanonicalText().contains("Supplier")) {
533534
return MutationSignature.unknown();

‎java-analysis-impl/src/main/java/com/siyeh/ig/inheritance/ExtendsConcreteCollectionInspectionBase.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import com.siyeh.ig.psiutils.CollectionUtils;
2222
import com.siyeh.ig.psiutils.TypeUtils;
2323
import com.siyeh.localize.InspectionGadgetsLocalize;
24+
import consulo.java.language.module.util.JavaClassNames;
2425
import jakarta.annotation.Nonnull;
2526

2627
public abstract class ExtendsConcreteCollectionInspectionBase extends BaseInspection {
@@ -64,7 +65,7 @@ public void visitClass(@Nonnull PsiClass aClass) {
6465
final String qualifiedName = superClass.getQualifiedName();
6566
if ("java.util.LinkedHashMap".equals(qualifiedName)) {
6667
final PsiMethod[] methods = aClass.findMethodsByName("removeEldestEntry", false);
67-
final PsiClassType entryType = TypeUtils.getType("java.util.Map.Entry", aClass);
68+
final PsiClassType entryType = TypeUtils.getType(JavaClassNames.JAVA_UTIL_MAP_ENTRY, aClass);
6869
for (PsiMethod method : methods) {
6970
if (!PsiType.BOOLEAN.equals(method.getReturnType())) {
7071
continue;

‎java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/ClassUtils.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public class ClassUtils {
7878
immutableTypes.add("java.math.MathContext");
7979
immutableTypes.add("java.nio.channels.FileLock");
8080
immutableTypes.add("java.nio.charset.Charset");
81-
immutableTypes.add("java.io.File");
81+
immutableTypes.add(JavaClassNames.JAVA_IO_FILE);
8282
immutableTypes.add("java.net.URI");
8383
immutableTypes.add("java.util.regex.Pattern");
8484
}

‎java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/CollectionUtils.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public class CollectionUtils {
4747
allCollectionClassesAndInterfaces.add("java.util.AbstractQueue");
4848
allCollectionClassesAndInterfaces.add("java.util.AbstractSequentialList");
4949
allCollectionClassesAndInterfaces.add("java.util.AbstractSet");
50-
allCollectionClassesAndInterfaces.add("java.util.ArrayList");
50+
allCollectionClassesAndInterfaces.add(JavaClassNames.JAVA_UTIL_ARRAY_LIST);
5151
allCollectionClassesAndInterfaces.add("java.util.ArrayDeque");
5252
allCollectionClassesAndInterfaces.add(JavaClassNames.JAVA_UTIL_COLLECTION);
5353
allCollectionClassesAndInterfaces.add(JavaClassNames.JAVA_UTIL_DICTIONARY);
@@ -62,10 +62,10 @@ public class CollectionUtils {
6262
allCollectionClassesAndInterfaces.add(JavaClassNames.JAVA_UTIL_LIST);
6363
allCollectionClassesAndInterfaces.add(JavaClassNames.JAVA_UTIL_MAP);
6464
allCollectionClassesAndInterfaces.add("java.util.PriorityQueue");
65-
allCollectionClassesAndInterfaces.add("java.util.Queue");
65+
allCollectionClassesAndInterfaces.add(JavaClassNames.JAVA_UTIL_QUEUE);
6666
allCollectionClassesAndInterfaces.add(JavaClassNames.JAVA_UTIL_SET);
67-
allCollectionClassesAndInterfaces.add("java.util.SortedMap");
68-
allCollectionClassesAndInterfaces.add("java.util.SortedSet");
67+
allCollectionClassesAndInterfaces.add(JavaClassNames.JAVA_UTIL_SORTED_MAP);
68+
allCollectionClassesAndInterfaces.add(JavaClassNames.JAVA_UTIL_SORTED_SET);
6969
allCollectionClassesAndInterfaces.add("java.util.Stack");
7070
allCollectionClassesAndInterfaces.add("java.util.TreeMap");
7171
allCollectionClassesAndInterfaces.add("java.util.TreeSet");
@@ -74,7 +74,7 @@ public class CollectionUtils {
7474
allCollectionClassesAndInterfaces.add("java.util.concurrent.ArrayBlockingQueue");
7575
allCollectionClassesAndInterfaces.add("java.util.concurrent.BlockingDeque");
7676
allCollectionClassesAndInterfaces.add("java.util.concurrent.BlockingQueue");
77-
allCollectionClassesAndInterfaces.add("java.util.concurrent.ConcurrentHashMap");
77+
allCollectionClassesAndInterfaces.add(JavaClassNames.JAVA_UTIL_CONCURRENT_HASH_MAP);
7878
allCollectionClassesAndInterfaces.add("java.util.concurrent.ConcurrentLinkedDeque");
7979
allCollectionClassesAndInterfaces.add("java.util.concurrent.ConcurrentLinkedQueue");
8080
allCollectionClassesAndInterfaces.add("java.util.concurrent.ConcurrentMap");
@@ -120,17 +120,17 @@ public class CollectionUtils {
120120
s_interfaceForCollection.put("TreeSet", "SortedSet");
121121
s_interfaceForCollection.put("Vector", "List");
122122
s_interfaceForCollection.put("WeakHashMap", "Map");
123-
s_interfaceForCollection.put("java.util.ArrayList", JavaClassNames.JAVA_UTIL_LIST);
123+
s_interfaceForCollection.put(JavaClassNames.JAVA_UTIL_ARRAY_LIST, JavaClassNames.JAVA_UTIL_LIST);
124124
s_interfaceForCollection.put("java.util.EnumMap", JavaClassNames.JAVA_UTIL_MAP);
125125
s_interfaceForCollection.put("java.util.EnumSet", JavaClassNames.JAVA_UTIL_SET);
126-
s_interfaceForCollection.put("java.util.HashMap", JavaClassNames.JAVA_UTIL_MAP);
127-
s_interfaceForCollection.put("java.util.HashSet", JavaClassNames.JAVA_UTIL_SET);
126+
s_interfaceForCollection.put(JavaClassNames.JAVA_UTIL_HASH_MAP, JavaClassNames.JAVA_UTIL_MAP);
127+
s_interfaceForCollection.put(JavaClassNames.JAVA_UTIL_HASH_SET, JavaClassNames.JAVA_UTIL_SET);
128128
s_interfaceForCollection.put("java.util.Hashtable", JavaClassNames.JAVA_UTIL_MAP);
129129
s_interfaceForCollection.put("java.util.IdentityHashMap", JavaClassNames.JAVA_UTIL_MAP);
130130
s_interfaceForCollection.put("java.util.LinkedHashMap", JavaClassNames.JAVA_UTIL_MAP);
131131
s_interfaceForCollection.put("java.util.LinkedHashSet", JavaClassNames.JAVA_UTIL_SET);
132132
s_interfaceForCollection.put("java.util.LinkedList", JavaClassNames.JAVA_UTIL_LIST);
133-
s_interfaceForCollection.put("java.util.PriorityQueue", "java.util.Queue");
133+
s_interfaceForCollection.put("java.util.PriorityQueue", JavaClassNames.JAVA_UTIL_QUEUE);
134134
s_interfaceForCollection.put("java.util.TreeMap", JavaClassNames.JAVA_UTIL_MAP);
135135
s_interfaceForCollection.put("java.util.TreeSet", JavaClassNames.JAVA_UTIL_SET);
136136
s_interfaceForCollection.put("java.util.Vector", JavaClassNames.JAVA_UTIL_LIST);

‎java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/EqualityCheck.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import com.intellij.java.language.psi.PsiReferenceExpression;
88
import com.intellij.java.language.psi.util.PsiUtil;
99
import com.siyeh.ig.callMatcher.CallMatcher;
10+
import consulo.java.language.module.util.JavaClassNames;
1011
import consulo.util.collection.ArrayUtil;
1112
import jakarta.annotation.Nullable;
1213
import org.jetbrains.annotations.Contract;
@@ -18,7 +19,7 @@
1819
*/
1920
public class EqualityCheck {
2021
private static final CallMatcher OBJECT_EQUALS = CallMatcher.anyOf(
21-
CallMatcher.staticCall("java.util.Objects", "equals").parameterCount(2),
22+
CallMatcher.staticCall(JavaClassNames.JAVA_UTIL_OBJECTS, "equals").parameterCount(2),
2223
CallMatcher.staticCall("com.google.common.base.Objects", "equal").parameterCount(2));
2324
private final
2425
@Nonnull

0 commit comments

Comments
 (0)