From 5658a4c4f2fe73b2ac663b302fe672165ff74941 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Fri, 27 Oct 2017 14:26:56 +0200 Subject: [PATCH] Cleanup (common constant) --- .../impl/analysis/GenericsHighlightUtil.java | 18 ++---------------- ...PossibleHeapPollutionVarargsInspection.java | 6 +++--- .../daemon/impl/analysis/JavaGenericsUtil.java | 2 +- .../src/com/intellij/psi/CommonClassNames.java | 4 +++- .../FinalMethodInFinalClassInspection.java | 3 ++- .../FinalPrivateMethodInspection.java | 3 ++- .../ig/jdk/VarargParameterInspection.java | 3 +-- 7 files changed, 14 insertions(+), 25 deletions(-) diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/GenericsHighlightUtil.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/GenericsHighlightUtil.java index d7d62427dedf..7675b7e192ec 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/GenericsHighlightUtil.java +++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/GenericsHighlightUtil.java @@ -1,18 +1,4 @@ -/* - * Copyright 2000-2017 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2000-2017 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.intellij.codeInsight.daemon.impl.analysis; import com.intellij.codeInsight.daemon.JavaErrorMessages; @@ -1043,7 +1029,7 @@ public class GenericsHighlightUtil { @Nullable static HighlightInfo checkSafeVarargsAnnotation(PsiMethod method, LanguageLevel languageLevel) { PsiModifierList list = method.getModifierList(); - final PsiAnnotation safeVarargsAnnotation = list.findAnnotation("java.lang.SafeVarargs"); + final PsiAnnotation safeVarargsAnnotation = list.findAnnotation(CommonClassNames.JAVA_LANG_SAFE_VARARGS); if (safeVarargsAnnotation == null) { return null; } diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/PossibleHeapPollutionVarargsInspection.java b/java/java-analysis-impl/src/com/intellij/codeInspection/PossibleHeapPollutionVarargsInspection.java index 53c3a79f34a4..b6d843c63df5 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/PossibleHeapPollutionVarargsInspection.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/PossibleHeapPollutionVarargsInspection.java @@ -92,7 +92,7 @@ public class PossibleHeapPollutionVarargsInspection extends AbstractBaseJavaLoca if (psiElement instanceof PsiIdentifier) { final PsiMethod psiMethod = (PsiMethod)psiElement.getParent(); if (psiMethod != null) { - new AddAnnotationPsiFix("java.lang.SafeVarargs", psiMethod, PsiNameValuePair.EMPTY_ARRAY).applyFix(project, descriptor); + new AddAnnotationPsiFix(CommonClassNames.JAVA_LANG_SAFE_VARARGS, psiMethod, PsiNameValuePair.EMPTY_ARRAY).applyFix(project, descriptor); } } } @@ -122,7 +122,7 @@ public class PossibleHeapPollutionVarargsInspection extends AbstractBaseJavaLoca if (psiElement instanceof PsiIdentifier) { final PsiMethod psiMethod = (PsiMethod)psiElement.getParent(); WriteAction.run(() -> psiMethod.getModifierList().setModifierProperty(PsiModifier.FINAL, true)); - new AddAnnotationPsiFix("java.lang.SafeVarargs", psiMethod, PsiNameValuePair.EMPTY_ARRAY).applyFix(project, descriptor); + new AddAnnotationPsiFix(CommonClassNames.JAVA_LANG_SAFE_VARARGS, psiMethod, PsiNameValuePair.EMPTY_ARRAY).applyFix(project, descriptor); } } } @@ -132,7 +132,7 @@ public class PossibleHeapPollutionVarargsInspection extends AbstractBaseJavaLoca public void visitMethod(PsiMethod method) { super.visitMethod(method); if (!PsiUtil.getLanguageLevel(method).isAtLeast(LanguageLevel.JDK_1_7)) return; - if (AnnotationUtil.isAnnotated(method, "java.lang.SafeVarargs", 0)) return; + if (AnnotationUtil.isAnnotated(method, CommonClassNames.JAVA_LANG_SAFE_VARARGS, 0)) return; if (!method.isVarArgs()) return; final PsiParameter[] parameters = method.getParameterList().getParameters(); diff --git a/java/java-psi-api/src/com/intellij/codeInsight/daemon/impl/analysis/JavaGenericsUtil.java b/java/java-psi-api/src/com/intellij/codeInsight/daemon/impl/analysis/JavaGenericsUtil.java index f90d4b8253f0..949b46f4a872 100644 --- a/java/java-psi-api/src/com/intellij/codeInsight/daemon/impl/analysis/JavaGenericsUtil.java +++ b/java/java-psi-api/src/com/intellij/codeInsight/daemon/impl/analysis/JavaGenericsUtil.java @@ -99,7 +99,7 @@ public class JavaGenericsUtil { return false; } - if (AnnotationUtil.isAnnotated(psiMethod, "java.lang.SafeVarargs", CHECK_EXTERNAL)) { + if (AnnotationUtil.isAnnotated(psiMethod, CommonClassNames.JAVA_LANG_SAFE_VARARGS, CHECK_EXTERNAL)) { return false; } diff --git a/platform/core-api/src/com/intellij/psi/CommonClassNames.java b/platform/core-api/src/com/intellij/psi/CommonClassNames.java index 7c37dd669436..ef7aa38ea342 100644 --- a/platform/core-api/src/com/intellij/psi/CommonClassNames.java +++ b/platform/core-api/src/com/intellij/psi/CommonClassNames.java @@ -84,6 +84,9 @@ public interface CommonClassNames { String JAVA_LANG_CLONEABLE = "java.lang.Cloneable"; String JAVA_LANG_COMPARABLE = "java.lang.Comparable"; + String JAVA_LANG_SAFE_VARARGS = "java.lang.SafeVarargs"; + String JAVA_LANG_FUNCTIONAL_INTERFACE = "java.lang.FunctionalInterface"; + String JAVA_LANG_NULL_POINTER_EXCEPTION = "java.lang.NullPointerException"; String JAVA_UTIL_CONCURRENT_FUTURE = "java.util.concurrent.Future"; @@ -103,7 +106,6 @@ public interface CommonClassNames { String JAVA_LANG_INVOKE_MH_POLYMORPHIC = "java.lang.invoke.MethodHandle.PolymorphicSignature"; String CLASS_FILE_EXTENSION = ".class"; - String JAVA_LANG_FUNCTIONAL_INTERFACE = "java.lang.FunctionalInterface"; // /** @deprecated use {@link #JAVA_UTIL_FUNCTION_BI_FUNCTION} (to be removed in IDEA 2019) */ diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/classlayout/FinalMethodInFinalClassInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/classlayout/FinalMethodInFinalClassInspection.java index 968b25be9557..9ab71de845bf 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/classlayout/FinalMethodInFinalClassInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/classlayout/FinalMethodInFinalClassInspection.java @@ -16,6 +16,7 @@ package com.siyeh.ig.classlayout; import com.intellij.codeInsight.AnnotationUtil; +import com.intellij.psi.CommonClassNames; import com.intellij.psi.PsiClass; import com.intellij.psi.PsiMethod; import com.intellij.psi.PsiModifier; @@ -61,7 +62,7 @@ public class FinalMethodInFinalClassInspection extends BaseInspection { return; } if (!method.hasModifierProperty(PsiModifier.STATIC) && - AnnotationUtil.findAnnotation(method, true, "java.lang.SafeVarargs") != null) { + AnnotationUtil.findAnnotation(method, true, CommonClassNames.JAVA_LANG_SAFE_VARARGS) != null) { return; } final PsiClass containingClass = method.getContainingClass(); diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/classlayout/FinalPrivateMethodInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/classlayout/FinalPrivateMethodInspection.java index 358018f18586..6dc053b813ec 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/classlayout/FinalPrivateMethodInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/classlayout/FinalPrivateMethodInspection.java @@ -16,6 +16,7 @@ package com.siyeh.ig.classlayout; import com.intellij.codeInsight.AnnotationUtil; +import com.intellij.psi.CommonClassNames; import com.intellij.psi.PsiMethod; import com.intellij.psi.PsiModifier; import com.siyeh.InspectionGadgetsBundle; @@ -66,7 +67,7 @@ public class FinalPrivateMethodInspection extends BaseInspection { || !method.hasModifierProperty(PsiModifier.PRIVATE)) { return; } - if (AnnotationUtil.isAnnotated(method, "java.lang.SafeVarargs", 0) && method.isVarArgs()) { + if (AnnotationUtil.isAnnotated(method, CommonClassNames.JAVA_LANG_SAFE_VARARGS, 0) && method.isVarArgs()) { return; } registerModifierError(PsiModifier.FINAL, method, PsiModifier.FINAL); diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/jdk/VarargParameterInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/jdk/VarargParameterInspection.java index 50f6306898fa..f99ee2d6536b 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/jdk/VarargParameterInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/jdk/VarargParameterInspection.java @@ -34,7 +34,6 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collection; import java.util.List; @@ -118,7 +117,7 @@ public class VarargParameterInspection extends BaseInspection { } final PsiType arrayType = type.toArrayType(); final PsiTypeElement newTypeElement = JavaPsiFacade.getElementFactory(lastParameter.getProject()).createTypeElement(arrayType); - final PsiAnnotation annotation = AnnotationUtil.findAnnotation(method, "java.lang.SafeVarargs"); + final PsiAnnotation annotation = AnnotationUtil.findAnnotation(method, CommonClassNames.JAVA_LANG_SAFE_VARARGS); if (annotation != null) { annotation.delete(); }