From 816f585d541f51ab106d67a617cbb01f52169fb0 Mon Sep 17 00:00:00 2001 From: Andrey Turbanov Date: Sun, 17 Apr 2022 16:07:57 +0300 Subject: [PATCH] Cleanup redundant null check before instanceof --- .../ajdt/internal/compiler/InterimCompilationResult.java | 2 +- .../aspectj/ajdt/internal/compiler/ast/ProceedVisitor.java | 5 ++--- .../ajdt/internal/compiler/ast/ThisJoinPointVisitor.java | 2 +- .../ajdt/internal/compiler/problem/AjProblemReporter.java | 4 ++-- .../aspectj/ajdt/internal/core/builder/AjBuildConfig.java | 2 +- .../main/java/org/aspectj/weaver/CrosscuttingMembers.java | 2 +- .../org/aspectj/weaver/PerObjectInterfaceTypeMunger.java | 2 +- .../aspectj/weaver/tools/cache/DefaultCacheKeyResolver.java | 2 +- 8 files changed, 10 insertions(+), 11 deletions(-) diff --git a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/InterimCompilationResult.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/InterimCompilationResult.java index ceb1231db9..c147cdafc0 100644 --- a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/InterimCompilationResult.java +++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/InterimCompilationResult.java @@ -56,7 +56,7 @@ public String fileName() { } public boolean equals(Object other) { - if (other == null || !(other instanceof InterimCompilationResult)) { + if (!(other instanceof InterimCompilationResult)) { return false; } InterimCompilationResult ir = (InterimCompilationResult) other; diff --git a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/ProceedVisitor.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/ProceedVisitor.java index d90feb7733..1ed6f009ef 100644 --- a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/ProceedVisitor.java +++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/ProceedVisitor.java @@ -83,9 +83,8 @@ boolean isRef(NameReference ref, Binding binding) { boolean isRef(Expression expr, Binding binding) { //System.err.println("isRef: " + expr + ", " + binding); - return expr != null - && expr instanceof NameReference - && isRef((NameReference) expr, binding); + return expr instanceof NameReference + && isRef((NameReference)expr, binding); } public void endVisit(SingleNameReference ref, BlockScope scope) { diff --git a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/ThisJoinPointVisitor.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/ThisJoinPointVisitor.java index b1189d9dcc..44e929cc7c 100644 --- a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/ThisJoinPointVisitor.java +++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/ThisJoinPointVisitor.java @@ -102,7 +102,7 @@ boolean isRef(NameReference ref, Binding binding) { } boolean isRef(Expression expr, Binding binding) { - return expr != null && expr instanceof NameReference && isRef((NameReference) expr, binding); + return expr instanceof NameReference && isRef((NameReference)expr, binding); } public void endVisit(SingleNameReference ref, BlockScope scope) { diff --git a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/problem/AjProblemReporter.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/problem/AjProblemReporter.java index 9604bab9be..59bea43e52 100644 --- a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/problem/AjProblemReporter.java +++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/problem/AjProblemReporter.java @@ -485,7 +485,7 @@ public void unusedPrivateType(TypeDeclaration typeDecl) { // don't output unused type warnings for aspects! if (typeDecl instanceof AspectDeclaration) return; - if (typeDecl.enclosingType != null && (typeDecl.enclosingType instanceof AspectDeclaration)) { + if (typeDecl.enclosingType instanceof AspectDeclaration) { AspectDeclaration ad = (AspectDeclaration) typeDecl.enclosingType; if (ad.concreteName != null) { List declares = ad.concreteName.declares; @@ -609,7 +609,7 @@ public void unusedArgument(LocalDeclaration localDecl) { Argument arg = (Argument) localDecl; if (arg.binding != null && arg.binding.declaringScope != null) { ReferenceContext context = arg.binding.declaringScope.referenceContext(); - if (context != null && context instanceof PointcutDeclaration) + if (context instanceof PointcutDeclaration) return; } } diff --git a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AjBuildConfig.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AjBuildConfig.java index 3e526002e0..0fa1d6258d 100644 --- a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AjBuildConfig.java +++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AjBuildConfig.java @@ -115,7 +115,7 @@ public BinarySourceFile(File dir, File src) { @Override public boolean equals(Object obj) { - if (obj != null && (obj instanceof BinarySourceFile)) { + if (obj instanceof BinarySourceFile) { BinarySourceFile other = (BinarySourceFile) obj; return (binSrc.equals(other.binSrc)); } diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/CrosscuttingMembers.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/CrosscuttingMembers.java index 17472ee6b6..d6acdefd98 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/CrosscuttingMembers.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/CrosscuttingMembers.java @@ -188,7 +188,7 @@ public void exposeType(UnresolvedType typeToExpose) { String signatureToLookFor = typeToExpose.getSignature(); for (ConcreteTypeMunger cTM : typeMungers) { ResolvedTypeMunger rTM = cTM.getMunger(); - if (rTM != null && rTM instanceof ExposeTypeMunger) { + if (rTM instanceof ExposeTypeMunger) { String exposedType = ((ExposeTypeMunger) rTM).getExposedTypeSignature(); if (exposedType.equals(signatureToLookFor)) { return; // dont need to bother diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/PerObjectInterfaceTypeMunger.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/PerObjectInterfaceTypeMunger.java index 5077177218..8225390749 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/PerObjectInterfaceTypeMunger.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/PerObjectInterfaceTypeMunger.java @@ -27,7 +27,7 @@ public class PerObjectInterfaceTypeMunger extends ResolvedTypeMunger { private TypePattern lazyTestTypePattern; public boolean equals(Object other) { - if (other == null || !(other instanceof PerObjectInterfaceTypeMunger)) { + if (!(other instanceof PerObjectInterfaceTypeMunger)) { return false; } PerObjectInterfaceTypeMunger o = (PerObjectInterfaceTypeMunger) other; diff --git a/weaver/src/main/java/org/aspectj/weaver/tools/cache/DefaultCacheKeyResolver.java b/weaver/src/main/java/org/aspectj/weaver/tools/cache/DefaultCacheKeyResolver.java index 5f0e547723..60de723859 100644 --- a/weaver/src/main/java/org/aspectj/weaver/tools/cache/DefaultCacheKeyResolver.java +++ b/weaver/src/main/java/org/aspectj/weaver/tools/cache/DefaultCacheKeyResolver.java @@ -55,7 +55,7 @@ public String createClassLoaderScope(ClassLoader cl, List aspects) { StringBuilder hashable = new StringBuilder(256); // Add the list of loader urls to the hash list - if (cl != null && cl instanceof URLClassLoader) { + if (cl instanceof URLClassLoader) { URL[] urls = ((URLClassLoader) cl).getURLs(); for (URL url : urls) { hashableStrings.add(url.toString());