diff --git a/java/compiler/impl/src/com/intellij/compiler/backwardRefs/JavaCompilerRefAdapter.java b/java/compiler/impl/src/com/intellij/compiler/backwardRefs/JavaCompilerRefAdapter.java index 1def25997c92..15562dbcf2a3 100644 --- a/java/compiler/impl/src/com/intellij/compiler/backwardRefs/JavaCompilerRefAdapter.java +++ b/java/compiler/impl/src/com/intellij/compiler/backwardRefs/JavaCompilerRefAdapter.java @@ -41,7 +41,7 @@ public class JavaCompilerRefAdapter implements LanguageCompilerRefAdapter { if (aClass == null || aClass instanceof PsiAnonymousClass) return null; final String jvmOwnerName = ClassUtil.getJVMClassName(aClass); final String name = field.getName(); - if (name == null || jvmOwnerName == null) return null; + if (jvmOwnerName == null) return null; final int ownerId = names.tryEnumerate(jvmOwnerName); if (ownerId == 0) return null; final int nameId = names.tryEnumerate(name); diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/AnnotationsHighlightUtil.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/AnnotationsHighlightUtil.java index 5f4d30d23b75..3684bb482840 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/AnnotationsHighlightUtil.java +++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/AnnotationsHighlightUtil.java @@ -727,7 +727,6 @@ public class AnnotationsHighlightUtil { if (field instanceof PsiEnumConstant) { String name = ((PsiEnumConstant)field).getName(); try { - //noinspection ConstantConditions return Enum.valueOf(RetentionPolicy.class, name); } catch (Exception e) { diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/NullabilityUtil.java b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/NullabilityUtil.java index e94e524d9cf1..1f52f2819057 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/NullabilityUtil.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/NullabilityUtil.java @@ -103,7 +103,7 @@ public class NullabilityUtil { private static boolean weAreSureThereAreNoExplicitWrites(PsiField field) { String name = field.getName(); - if (name == null || field.getInitializer() != null) return false; + if (field.getInitializer() != null) return false; if (!isCheapEnoughToSearch(field, name)) return false; diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JavaKeywordCompletion.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaKeywordCompletion.java index 449dc96cc9d0..146b8c1a7c20 100644 --- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaKeywordCompletion.java +++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaKeywordCompletion.java @@ -344,7 +344,7 @@ public class JavaKeywordCompletion { TailType tailType = TailTypes.forSwitchLabel(switchBlock); for (PsiField field : switchType.getAllFields()) { String name = field.getName(); - if (!(field instanceof PsiEnumConstant) || used.contains(CompletionUtil.getOriginalOrSelf(field)) || name == null) { + if (!(field instanceof PsiEnumConstant) || used.contains(CompletionUtil.getOriginalOrSelf(field))) { continue; } String prefix = "case "; diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JavaMemberNameCompletionContributor.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaMemberNameCompletionContributor.java index 3733a70fd76b..ebfb5cdc13e9 100644 --- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaMemberNameCompletionContributor.java +++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaMemberNameCompletionContributor.java @@ -203,7 +203,7 @@ public class JavaMemberNameCompletionContributor extends CompletionContributor { for (PsiField field : psiClass.getFields()) { String name = field.getName(); - if (field.getType().isAssignableFrom(var.getType()) && name != null) { + if (field.getType().isAssignableFrom(var.getType())) { String prop = codeStyleManager.variableNameToPropertyName(name, VariableKind.FIELD); addLookupItems(set, null, matcher, project, codeStyleManager.propertyNameToVariableName(prop, VariableKind.PARAMETER)); } diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/VariableAccessFromInnerClassJava10Fix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/VariableAccessFromInnerClassJava10Fix.java index 8150c3ce6599..7eab5d6a4557 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/VariableAccessFromInnerClassJava10Fix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/VariableAccessFromInnerClassJava10Fix.java @@ -24,7 +24,6 @@ import org.jetbrains.annotations.Nullable; import java.util.Arrays; import java.util.LinkedHashSet; import java.util.List; -import java.util.Objects; import java.util.stream.Collectors; import static com.intellij.util.ObjectUtils.tryCast; @@ -214,7 +213,6 @@ public class VariableAccessFromInnerClassJava10Fix extends BaseIntentionAction { if (!TypeUtils.isJavaLangObject(anonymousClass.getBaseClassType())) return null; if (Arrays.stream(anonymousClass.getFields()) .map(field -> field.getName()) - .filter(Objects::nonNull) .anyMatch(name -> name.equals(variableName))) { return null; } diff --git a/java/java-impl/src/com/intellij/codeInsight/generation/GenerateConstructorHandler.java b/java/java-impl/src/com/intellij/codeInsight/generation/GenerateConstructorHandler.java index 43758553037a..3dd180c4a121 100644 --- a/java/java-impl/src/com/intellij/codeInsight/generation/GenerateConstructorHandler.java +++ b/java/java-impl/src/com/intellij/codeInsight/generation/GenerateConstructorHandler.java @@ -253,7 +253,6 @@ public class GenerateConstructorHandler extends GenerateMembersHandlerBase { List fieldParams = new ArrayList<>(); for (PsiField field : fields) { String fieldName = field.getName(); - assert fieldName != null : field; String name = javaStyle.variableNameToPropertyName(fieldName, VariableKind.FIELD); String parmName = javaStyle.propertyNameToVariableName(name, VariableKind.PARAMETER); parmName = javaStyle.suggestUniqueVariableName(parmName, dummyConstructor, true); diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/ExtractSetFromComparisonChainAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/ExtractSetFromComparisonChainAction.java index f34a11bc3cfd..eab57ee59bd2 100644 --- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/ExtractSetFromComparisonChainAction.java +++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/ExtractSetFromComparisonChainAction.java @@ -290,7 +290,6 @@ public class ExtractSetFromComparisonChainAction extends PsiElementBaseIntention PsiClass containingClass = field.getContainingClass(); if (containingClass == null) return null; String name = field.getName(); - if (name == null) return null; PsiExpression expression = myExpressionPtr.getElement(); PsiExpression firstComparison = myFirstComparisonPtr.getElement(); PsiExpression lastComparison = myLastComparisonPtr.getElement(); @@ -365,7 +364,7 @@ public class ExtractSetFromComparisonChainAction extends PsiElementBaseIntention PsiReferenceExpression ref = tryCast(PsiUtil.skipParenthesizedExprDown(constant), PsiReferenceExpression.class); if (ref != null) { PsiEnumConstant enumConstant = tryCast(ref.resolve(), PsiEnumConstant.class); - if (enumConstant != null && enumConstant.getName() != null) { + if (enumConstant != null) { return new ExpressionToConstantComparison(candidate, nonConstant, ref, enumConstant.getName()); } } diff --git a/java/java-impl/src/com/intellij/ide/projectView/impl/nodes/PsiFieldNode.java b/java/java-impl/src/com/intellij/ide/projectView/impl/nodes/PsiFieldNode.java index c9766c6802a3..7b014cfc5adc 100644 --- a/java/java-impl/src/com/intellij/ide/projectView/impl/nodes/PsiFieldNode.java +++ b/java/java-impl/src/com/intellij/ide/projectView/impl/nodes/PsiFieldNode.java @@ -20,7 +20,6 @@ import com.intellij.ide.projectView.ViewSettings; import com.intellij.ide.util.treeView.AbstractTreeNode; import com.intellij.openapi.project.IndexNotReadyException; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.PsiClass; import com.intellij.psi.PsiField; import com.intellij.psi.PsiSubstitutor; @@ -51,7 +50,7 @@ public class PsiFieldNode extends BasePsiMemberNode{ PsiSubstitutor.EMPTY); } catch (IndexNotReadyException e) { - name = StringUtil.notNullize(field.getName()); + name = field.getName(); } int c = name.indexOf('\n'); if (c > -1) { diff --git a/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/AtomicReferenceImplicitUsageProvider.java b/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/AtomicReferenceImplicitUsageProvider.java index cd3b72864709..25a03a9a46bc 100644 --- a/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/AtomicReferenceImplicitUsageProvider.java +++ b/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/AtomicReferenceImplicitUsageProvider.java @@ -135,7 +135,7 @@ public class AtomicReferenceImplicitUsageProvider implements ImplicitUsageProvid Project project = field.getProject(); PsiSearchHelper searchHelper = PsiSearchHelper.getInstance(project); - if (scope instanceof GlobalSearchScope && name != null && + if (scope instanceof GlobalSearchScope && searchHelper.isCheapEnoughToSearch(name, (GlobalSearchScope)scope, null, null) == FEW_OCCURRENCES) { return scope; } diff --git a/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/JavaLangClassMemberReference.java b/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/JavaLangClassMemberReference.java index 887f65061f44..c2066130bfc2 100644 --- a/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/JavaLangClassMemberReference.java +++ b/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/JavaLangClassMemberReference.java @@ -107,7 +107,6 @@ public class JavaLangClassMemberReference extends PsiReferenceBase field.getName() != null) .sorted(Comparator.comparing(PsiField::getName)) .map(field -> JavaLookupElementBuilder.forField(field)) .toArray(); @@ -115,7 +114,7 @@ public class JavaLangClassMemberReference extends PsiReferenceBase uniqueNames = new THashSet<>(); return Arrays.stream(ownerClass.getPsiClass().getAllFields()) - .filter(field -> isPotentiallyAccessible(field, ownerClass) && field.getName() != null && uniqueNames.add(field.getName())) + .filter(field -> isPotentiallyAccessible(field, ownerClass) && uniqueNames.add(field.getName())) .sorted(Comparator.comparingInt((PsiField field) -> isPublic(field) ? 0 : 1).thenComparing(PsiField::getName)) .map(field -> withPriority(JavaLookupElementBuilder.forField(field), isPublic(field))) .toArray(); @@ -142,7 +141,6 @@ public class JavaLangClassMemberReference extends PsiReferenceBase field.getName() != null) .sorted(Comparator.comparingInt((PsiField field) -> isAtomicallyUpdateable(field) ? 0 : 1).thenComparing(PsiField::getName)) .map(field -> withPriority(JavaLookupElementBuilder.forField(field), isAtomicallyUpdateable(field))) .toArray(); diff --git a/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/JavaLangInvokeHandleReference.java b/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/JavaLangInvokeHandleReference.java index 43cfd65e22ce..2ab59bffe4aa 100644 --- a/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/JavaLangInvokeHandleReference.java +++ b/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/JavaLangInvokeHandleReference.java @@ -158,7 +158,7 @@ public class JavaLangInvokeHandleReference extends PsiReferenceBase field != null && (field.getContainingClass() == ownerClass.getPsiClass() || !field.hasModifierProperty(PsiModifier.PRIVATE)) && - field.getName() != null && uniqueNames.add(field.getName())) + uniqueNames.add(field.getName())) .filter(filter) .sorted(Comparator.comparing((PsiField field) -> isPublic(field) ? 0 : 1).thenComparing(PsiField::getName)) .map(field -> withPriority(JavaLookupElementBuilder.forField(field).withInsertHandler(this), isPublic(field))) diff --git a/java/java-impl/src/com/intellij/refactoring/extractMethodObject/reflect/FieldDeclarationDescriptor.java b/java/java-impl/src/com/intellij/refactoring/extractMethodObject/reflect/FieldDeclarationDescriptor.java index 0027b3bd093c..dd9172bba6a3 100644 --- a/java/java-impl/src/com/intellij/refactoring/extractMethodObject/reflect/FieldDeclarationDescriptor.java +++ b/java/java-impl/src/com/intellij/refactoring/extractMethodObject/reflect/FieldDeclarationDescriptor.java @@ -21,7 +21,7 @@ public class FieldDeclarationDescriptor implements ItemToReplaceDescriptor { @Nullable public static ItemToReplaceDescriptor createIfInaccessible(@NotNull PsiField field) { String fieldName = field.getName(); - if (!PsiReflectionAccessUtil.isAccessibleType(field.getType()) && fieldName != null) { + if (!PsiReflectionAccessUtil.isAccessibleType(field.getType())) { return new FieldDeclarationDescriptor(field, fieldName); } diff --git a/java/java-impl/src/com/intellij/refactoring/extractMethodObject/reflect/FieldDescriptor.java b/java/java-impl/src/com/intellij/refactoring/extractMethodObject/reflect/FieldDescriptor.java index 200c6b6e7934..c318eeead7b0 100644 --- a/java/java-impl/src/com/intellij/refactoring/extractMethodObject/reflect/FieldDescriptor.java +++ b/java/java-impl/src/com/intellij/refactoring/extractMethodObject/reflect/FieldDescriptor.java @@ -105,7 +105,7 @@ public class FieldDescriptor implements ItemToReplaceDescriptor { PsiClass containingClass = myField.getContainingClass(); String className = containingClass == null ? null : ClassUtil.getJVMClassName(containingClass); String fieldName = myField.getName(); - if (className == null || fieldName == null) { + if (className == null) { LOG.warn("Code is incomplete. Class name or field name not found"); return null; } diff --git a/java/java-impl/src/com/intellij/refactoring/move/moveInstanceMethod/MoveInstanceMethodProcessor.java b/java/java-impl/src/com/intellij/refactoring/move/moveInstanceMethod/MoveInstanceMethodProcessor.java index 9c1adac6aea0..e85a79ba2ba1 100644 --- a/java/java-impl/src/com/intellij/refactoring/move/moveInstanceMethod/MoveInstanceMethodProcessor.java +++ b/java/java-impl/src/com/intellij/refactoring/move/moveInstanceMethod/MoveInstanceMethodProcessor.java @@ -496,7 +496,6 @@ public class MoveInstanceMethodProcessor extends BaseRefactoringProcessor{ if (ExpressionUtils.isReferenceTo(qualifier, myTargetVariable)) { if (resolved instanceof PsiField) { String fieldName = ((PsiField)resolved).getName(); - LOG.assertTrue(fieldName != null); for (PsiParameter parameter : myMethod.getParameterList().getParameters()) { if (Comparing.strEqual(parameter.getName(), fieldName) || facade.getResolveHelper().resolveReferencedVariable(fieldName, expression) != null) { diff --git a/java/java-psi-api/src/com/intellij/psi/PsiField.java b/java/java-psi-api/src/com/intellij/psi/PsiField.java index 6120c3c33ce7..38975c837f7b 100644 --- a/java/java-psi-api/src/com/intellij/psi/PsiField.java +++ b/java/java-psi-api/src/com/intellij/psi/PsiField.java @@ -36,4 +36,8 @@ public interface PsiField extends PsiJvmMember, PsiVariable, PsiDocCommentOwner, @NotNull @Override PsiType getType(); + + @NotNull + @Override + String getName(); } diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/ConstantExpressionVisitor.java b/java/java-psi-impl/src/com/intellij/psi/impl/ConstantExpressionVisitor.java index aff7ef73259f..e2ff1fe387af 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/ConstantExpressionVisitor.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/ConstantExpressionVisitor.java @@ -545,7 +545,6 @@ class ConstantExpressionVisitor extends JavaElementVisitor implements PsiConstan PsiElement resolvedExpression = expression.resolve(); if (resolvedExpression instanceof PsiEnumConstant) { String constant = ((PsiEnumConstant)resolvedExpression).getName(); - if (constant == null) return; PsiReferenceExpression qualifier = (PsiReferenceExpression)expression.getQualifier(); if (qualifier == null) return; PsiElement element = qualifier.resolve(); diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/PsiClassImplUtil.java b/java/java-psi-impl/src/com/intellij/psi/impl/PsiClassImplUtil.java index 6c9a8948254e..1fb10f94680f 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/PsiClassImplUtil.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/PsiClassImplUtil.java @@ -1171,7 +1171,6 @@ public class PsiClassImplUtil { public static boolean isFieldEquivalentTo(@NotNull PsiField field, PsiElement another) { if (!(another instanceof PsiField)) return false; String name1 = field.getName(); - if (name1 == null) return false; if (!another.isValid()) return false; String name2 = ((PsiField)another).getName(); diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/light/LightField.java b/java/java-psi-impl/src/com/intellij/psi/impl/light/LightField.java index 7d1242cae77f..ce4ef8f4b153 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/light/LightField.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/light/LightField.java @@ -41,6 +41,7 @@ public class LightField extends LightElement implements PsiField { } @Override + @NotNull public String getName() { return myField.getName(); } diff --git a/java/java-structure-view/src/com/intellij/ide/structureView/impl/java/PsiFieldTreeElement.java b/java/java-structure-view/src/com/intellij/ide/structureView/impl/java/PsiFieldTreeElement.java index 2c262f4c132d..75d1cc2f767b 100644 --- a/java/java-structure-view/src/com/intellij/ide/structureView/impl/java/PsiFieldTreeElement.java +++ b/java/java-structure-view/src/com/intellij/ide/structureView/impl/java/PsiFieldTreeElement.java @@ -61,10 +61,7 @@ public class PsiFieldTreeElement extends JavaClassTreeElementBase impl public String getAlphaSortKey() { final PsiField field = getElement(); if (field != null) { - String name = field.getName(); - if (name != null) { - return name; - } + return field.getName(); } return ""; } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/javabeans/SuspiciousGetterSetterInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/javabeans/SuspiciousGetterSetterInspection.java index 7f7cf361b10b..5d9e9b0d4b24 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/javabeans/SuspiciousGetterSetterInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/javabeans/SuspiciousGetterSetterInspection.java @@ -104,9 +104,6 @@ public class SuspiciousGetterSetterInspection extends BaseInspection { else { return; } - if (fieldName == null) { - return; - } final JavaCodeStyleManager codeStyleManager = JavaCodeStyleManager.getInstance(method.getProject()); final String computedFieldName = codeStyleManager.propertyNameToVariableName(extractedFieldName, VariableKind.FIELD); final String computedStaticFieldName = codeStyleManager.propertyNameToVariableName(extractedFieldName, VariableKind.STATIC_FINAL_FIELD); diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/logging/LoggingConditionDisagreesWithLogStatementInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/logging/LoggingConditionDisagreesWithLogStatementInspection.java index 2a5ab12ecdeb..0ec1a6d5aee5 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/logging/LoggingConditionDisagreesWithLogStatementInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/logging/LoggingConditionDisagreesWithLogStatementInspection.java @@ -265,7 +265,7 @@ public class LoggingConditionDisagreesWithLogStatementInspection extends BaseIns } final PsiField field = (PsiField)target; final String fieldName = field.getName(); - return fieldName != null && !StringUtil.toLowerCase(fieldName).equals(priority); + return !StringUtil.toLowerCase(fieldName).equals(priority); } else if ("isEnabledFor".equals(methodName)) { final PsiExpressionList argumentList = methodCallExpression.getArgumentList(); @@ -290,7 +290,7 @@ public class LoggingConditionDisagreesWithLogStatementInspection extends BaseIns } final PsiField field = (PsiField)argumentTarget; final String fieldName = field.getName(); - return fieldName != null && !StringUtil.toLowerCase(fieldName).equals(priority); + return !StringUtil.toLowerCase(fieldName).equals(priority); } } return false; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/InlineGetterSetterCallFix.java b/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/InlineGetterSetterCallFix.java index 107874767a0b..0b929f7118dc 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/InlineGetterSetterCallFix.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/InlineGetterSetterCallFix.java @@ -58,7 +58,6 @@ public class InlineGetterSetterCallFix extends InspectionGadgetsFix { final PsiField field = myGetter ? PropertyUtil.getFieldOfGetter(method) : PropertyUtil.getFieldOfSetter(method); if (field == null) return; final String name = field.getName(); - if (name == null) return; final CommentTracker tracker = new CommentTracker(); final StringBuilder newText = new StringBuilder(); final PsiExpression qualifier = methodExpression.getQualifierExpression(); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/initialization/NonThreadSafeLazyInitializationInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/initialization/NonThreadSafeLazyInitializationInspection.java index bc6691d08c6e..b9dcae5441cb 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/initialization/NonThreadSafeLazyInitializationInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/initialization/NonThreadSafeLazyInitializationInspection.java @@ -135,7 +135,6 @@ public class NonThreadSafeLazyInitializationInspection extends BaseInspection { } final PsiField field = (PsiField)resolved; final String fieldName = field.getName(); - assert fieldName != null; @NonNls final String holderName = StringUtil.capitalize(fieldName) + "Holder"; final PsiElement expressionParent = expression.getParent(); if (!(expressionParent instanceof PsiAssignmentExpression)) { diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/naming/FieldNamingConventionInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/naming/FieldNamingConventionInspection.java index 292bc2719661..3bc0d02620a0 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/naming/FieldNamingConventionInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/naming/FieldNamingConventionInspection.java @@ -38,9 +38,7 @@ public class FieldNamingConventionInspection extends AbstractNamingConventionIns @Override public void visitField(PsiField field) { String name = field.getName(); - if (name != null) { - checkName(field, name, holder); - } + checkName(field, name, holder); } }; } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/naming/UpperCaseFieldNameNotConstantInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/naming/UpperCaseFieldNameNotConstantInspection.java index d3039cd78568..385491310fd3 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/naming/UpperCaseFieldNameNotConstantInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/naming/UpperCaseFieldNameNotConstantInspection.java @@ -73,9 +73,6 @@ public class UpperCaseFieldNameNotConstantInspection extends BaseInspection { return; } final String fieldName = field.getName(); - if (fieldName == null) { - return; - } if (!fieldName.equals(StringUtil.toUpperCase(fieldName))) { return; } diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/switchbranches/CreateMissingSwitchBranchesAction.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/switchbranches/CreateMissingSwitchBranchesAction.java index 684efb171f9d..e2ae84d29ee3 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/switchbranches/CreateMissingSwitchBranchesAction.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/switchbranches/CreateMissingSwitchBranchesAction.java @@ -192,7 +192,6 @@ public class CreateMissingSwitchBranchesAction extends PsiElementBaseIntentionAc @Nullable static Value fromField(@NotNull PsiField field) { String name = field.getName(); - if (name == null) return null; PsiClass aClass = field.getContainingClass(); if (aClass == null) return null; String className = aClass.getQualifiedName(); diff --git a/plugins/devkit/devkit-core/src/dom/impl/ExtensionDomExtender.java b/plugins/devkit/devkit-core/src/dom/impl/ExtensionDomExtender.java index b8464e49de53..77642cd432f4 100644 --- a/plugins/devkit/devkit-core/src/dom/impl/ExtensionDomExtender.java +++ b/plugins/devkit/devkit-core/src/dom/impl/ExtensionDomExtender.java @@ -108,7 +108,6 @@ public class ExtensionDomExtender extends DomExtender { } final String fieldName = field.getName(); - assert fieldName != null; final PsiAnnotation attrAnno = PsiUtil.findAnnotation(Attribute.class, field, getter, setter); if (attrAnno != null) { final String attrName = getStringAttribute(attrAnno, "value", fieldName); diff --git a/plugins/devkit/devkit-core/src/dom/impl/ExtensionPointImpl.java b/plugins/devkit/devkit-core/src/dom/impl/ExtensionPointImpl.java index d87b0463ee50..6232bfb624fa 100644 --- a/plugins/devkit/devkit-core/src/dom/impl/ExtensionPointImpl.java +++ b/plugins/devkit/devkit-core/src/dom/impl/ExtensionPointImpl.java @@ -66,7 +66,6 @@ public abstract class ExtensionPointImpl implements ExtensionPoint { final List result = new SmartList<>(); for (PsiField field : beanClass.getAllFields()) { final String fieldName = field.getName(); - if (fieldName == null) continue; if (Extension.isClassField(fieldName) && ExtensionDomExtender.findWithElement(getWithElements(), field) == null) { diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/findUsages/GrAliasedImportedElementSearcher.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/findUsages/GrAliasedImportedElementSearcher.java index 265ce6314016..310092c5e523 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/findUsages/GrAliasedImportedElementSearcher.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/findUsages/GrAliasedImportedElementSearcher.java @@ -40,10 +40,8 @@ public class GrAliasedImportedElementSearcher extends QueryExecutorBase collectedFields) { return collectedFields.stream() - .filter(field -> field.getName() != null) .filter(field -> !field.hasModifierProperty(PsiModifier.STATIC)) .filter(field -> { PsiClass aClass = field.getContainingClass(); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/actions/generate/equals/GroovyGenerateEqualsHelper.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/actions/generate/equals/GroovyGenerateEqualsHelper.java index 77b68c74a38f..353d00ed4867 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/actions/generate/equals/GroovyGenerateEqualsHelper.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/actions/generate/equals/GroovyGenerateEqualsHelper.java @@ -449,7 +449,6 @@ public class GroovyGenerateEqualsHelper { if (!(f1.getType() instanceof PsiPrimitiveType) && f2.getType() instanceof PsiPrimitiveType) return 1; final String name1 = f1.getName(); final String name2 = f2.getName(); - assert name1 != null && name2 != null; return name1.compareTo(name2); } } diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/codeInsight/JavaFxFieldToPropertyIntention.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/codeInsight/JavaFxFieldToPropertyIntention.java index af71c3af88d5..e55a327ee5f0 100644 --- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/codeInsight/JavaFxFieldToPropertyIntention.java +++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/codeInsight/JavaFxFieldToPropertyIntention.java @@ -179,7 +179,7 @@ public class JavaFxFieldToPropertyIntention extends PsiElementBaseIntentionActio final String fieldName = field.getName(); final PsiClass containingClass = field.getContainingClass(); final PsiTypeElement typeElement = field.getTypeElement(); - if (fieldName != null && containingClass != null && typeElement != null) { + if (containingClass != null && typeElement != null) { final ObservableType observableType = ObservableType.createObservableType(field, project); if (observableType != null) { return new PropertyInfo(field, containingClass, typeElement, fieldName, observableType); diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/codeInsight/JavaFxGetterSetterPrototypeProvider.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/codeInsight/JavaFxGetterSetterPrototypeProvider.java index 5056ec8b314d..fd9b90b7f97a 100644 --- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/codeInsight/JavaFxGetterSetterPrototypeProvider.java +++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/codeInsight/JavaFxGetterSetterPrototypeProvider.java @@ -56,9 +56,7 @@ public class JavaFxGetterSetterPrototypeProvider extends GetterSetterPrototypePr getterBody.getStatements()[0].replace(factory.createStatementFromText("return " + fieldName + ".get();", field)); final PsiMethod propertyGetter = PropertyUtilBase.generateGetterPrototype(field); - if (propertyGetter != null && fieldName != null) { - propertyGetter.setName(JavaCodeStyleManager.getInstance(project).variableNameToPropertyName(fieldName, VariableKind.FIELD) + JavaFxCommonNames.PROPERTY_METHOD_SUFFIX); - } + propertyGetter.setName(JavaCodeStyleManager.getInstance(project).variableNameToPropertyName(fieldName, VariableKind.FIELD) + JavaFxCommonNames.PROPERTY_METHOD_SUFFIX); return new PsiMethod[] {getter, GenerateMembersUtil.annotateOnOverrideImplement(field.getContainingClass(), propertyGetter)}; } diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/inspections/JavaFxImplicitUsageProvider.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/inspections/JavaFxImplicitUsageProvider.java index 60843cd0d6e7..06dd3d213ffa 100644 --- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/inspections/JavaFxImplicitUsageProvider.java +++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/inspections/JavaFxImplicitUsageProvider.java @@ -70,7 +70,6 @@ public class JavaFxImplicitUsageProvider implements ImplicitUsageProvider { final PsiField field = (PsiField)element; if (!isImplicitFxmlAccess(field)) return false; final String fieldName = field.getName(); - if (fieldName == null) return false; final PsiClass containingClass = field.getContainingClass(); if (containingClass == null) return false; @@ -102,10 +101,8 @@ public class JavaFxImplicitUsageProvider implements ImplicitUsageProvider { private static boolean isInjectedByFxmlLoader(@NotNull PsiField field) { final String fieldName = field.getName(); final PsiType fieldType = field.getType(); - return fieldName != null && - ("resources".equals(fieldName) && InheritanceUtil.isInheritor(fieldType, "java.util.ResourceBundle") || - "location".equals(fieldName) && InheritanceUtil.isInheritor(fieldType, "java.net.URL")) && - isDeclaredInControllerClass(field); + return ("resources".equals(fieldName) && InheritanceUtil.isInheritor(fieldType, "java.util.ResourceBundle") || + "location".equals(fieldName) && InheritanceUtil.isInheritor(fieldType, "java.net.URL")) && isDeclaredInControllerClass(field); } private static boolean isDeclaredInControllerClass(@NotNull PsiMember member) { diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxControllerFieldSearcher.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxControllerFieldSearcher.java index 6732b13e67ff..71e7118535a4 100644 --- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxControllerFieldSearcher.java +++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxControllerFieldSearcher.java @@ -35,7 +35,6 @@ public class JavaFxControllerFieldSearcher implements QueryExecutor { final String fieldName = field.getName(); - if (fieldName == null) return; final VirtualFile virtualFile = file.getViewProvider().getVirtualFile(); final SearchScope searchScope = queryParameters.getEffectiveSearchScope(); if (searchScope.contains(virtualFile)) { diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/binding/FormReferencesSearcher.java b/plugins/ui-designer/src/com/intellij/uiDesigner/binding/FormReferencesSearcher.java index fc5573c4454e..3778898a1669 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/binding/FormReferencesSearcher.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/binding/FormReferencesSearcher.java @@ -123,7 +123,7 @@ public class FormReferencesSearcher implements QueryExecutor enumConstant.getName()); - return className == null || processReferencesInUIFormsInner(className, enumConstant, processor, scope, psiManager, filterScope); + return processReferencesInUIFormsInner(className, enumConstant, processor, scope, psiManager, filterScope); } private static boolean processReferencesInUIFormsInner(String name,