Skip to content

Commit 2a97f3c

Browse files
jlerbscjlerbsc
committed
fix: Replace this if-then-else statement by a single return statement (sonar rule)
1 parent d7efb09 commit 2a97f3c

File tree

10 files changed

+62
-104
lines changed

10 files changed

+62
-104
lines changed

‎javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserEnumDeclaration.java

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -132,10 +132,7 @@ public boolean canBeAssignedTo(ResolvedReferenceTypeDeclaration other) {
132132
if (otherName.equals(JAVA_IO_SERIALIZABLE)) {
133133
return true;
134134
}
135-
if (other.isJavaLangObject()) {
136-
return true;
137-
}
138-
return false;
135+
return other.isJavaLangObject();
139136
}
140137

141138
@Override
@@ -185,9 +182,7 @@ public boolean equals(Object o) {
185182

186183
JavaParserEnumDeclaration that = (JavaParserEnumDeclaration) o;
187184

188-
if (!wrappedNode.equals(that.wrappedNode)) return false;
189-
190-
return true;
185+
return wrappedNode.equals(that.wrappedNode);
191186
}
192187

193188
@Override

‎javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserInterfaceDeclaration.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,7 @@ public boolean equals(Object o) {
9393

9494
JavaParserInterfaceDeclaration that = (JavaParserInterfaceDeclaration) o;
9595

96-
if (!wrappedNode.equals(that.wrappedNode)) return false;
97-
98-
return true;
96+
return wrappedNode.equals(that.wrappedNode);
9997
}
10098

10199
@Override

‎javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserTypeParameter.java

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,11 @@
2121

2222
package com.github.javaparser.symbolsolver.javaparsermodel.declarations;
2323

24+
import static com.github.javaparser.resolution.Navigator.demandParentNode;
25+
26+
import java.util.*;
27+
import java.util.stream.Collectors;
28+
2429
import com.github.javaparser.ast.Node;
2530
import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration;
2631
import com.github.javaparser.ast.type.ClassOrInterfaceType;
@@ -34,11 +39,6 @@
3439
import com.github.javaparser.symbolsolver.javaparsermodel.JavaParserFacade;
3540
import com.github.javaparser.symbolsolver.logic.AbstractTypeDeclaration;
3641

37-
import java.util.*;
38-
import java.util.stream.Collectors;
39-
40-
import static com.github.javaparser.resolution.Navigator.demandParentNode;
41-
4242

4343
/**
4444
* @author Federico Tomassetti
@@ -69,9 +69,7 @@ public boolean equals(Object o) {
6969

7070
JavaParserTypeParameter that = (JavaParserTypeParameter) o;
7171

72-
if (wrappedNode != null ? !wrappedNode.equals(that.wrappedNode) : that.wrappedNode != null) return false;
73-
74-
return true;
72+
return wrappedNode != null && wrappedNode.equals(that.wrappedNode);
7573
}
7674

7775
@Override

‎javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistEnumDeclaration.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -137,10 +137,7 @@ public boolean canBeAssignedTo(ResolvedReferenceTypeDeclaration other) {
137137
if (otherName.equals(JAVA_IO_SERIALIZABLE)) {
138138
return true;
139139
}
140-
if (other.isJavaLangObject()) {
141-
return true;
142-
}
143-
return false;
140+
return other.isJavaLangObject();
144141
}
145142

146143
@Override

‎javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistTypeParameter.java

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,20 @@
2121

2222
package com.github.javaparser.symbolsolver.javassistmodel;
2323

24+
import java.util.ArrayList;
25+
import java.util.List;
26+
import java.util.Objects;
27+
import java.util.Optional;
28+
2429
import com.github.javaparser.resolution.TypeSolver;
2530
import com.github.javaparser.resolution.declarations.ResolvedMethodLikeDeclaration;
2631
import com.github.javaparser.resolution.declarations.ResolvedReferenceTypeDeclaration;
2732
import com.github.javaparser.resolution.declarations.ResolvedTypeParameterDeclaration;
2833
import com.github.javaparser.resolution.declarations.ResolvedTypeParametrizable;
2934
import com.github.javaparser.resolution.model.typesystem.ReferenceTypeImpl;
3035
import com.github.javaparser.resolution.types.ResolvedReferenceType;
31-
import javassist.bytecode.SignatureAttribute;
3236

33-
import java.util.ArrayList;
34-
import java.util.List;
35-
import java.util.Objects;
36-
import java.util.Optional;
37+
import javassist.bytecode.SignatureAttribute;
3738

3839
/**
3940
* @author Federico Tomassetti
@@ -60,14 +61,11 @@ public boolean equals(Object o) {
6061
if (!getQualifiedName().equals(that.getQualifiedName())) {
6162
return false;
6263
}
63-
if (declaredOnType() != that.declaredOnType()) {
64-
return false;
65-
}
66-
if (declaredOnMethod() != that.declaredOnMethod()) {
67-
return false;
64+
if (declaredOnType() == that.declaredOnType()) {
65+
return true;
6866
}
6967
// TODO check bounds
70-
return true;
68+
return declaredOnMethod() == that.declaredOnMethod();
7169
}
7270

7371
@Override
@@ -128,7 +126,7 @@ public Optional<ResolvedReferenceTypeDeclaration> containerType() {
128126
}
129127
return Optional.empty();
130128
}
131-
129+
132130
@Override
133131
public ResolvedReferenceType object() {
134132
return new ReferenceTypeImpl(typeSolver.getSolvedJavaLangObject());

‎javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionClassDeclaration.java

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,13 @@
2121

2222
package com.github.javaparser.symbolsolver.reflectionmodel;
2323

24+
import java.lang.reflect.Field;
25+
import java.lang.reflect.Method;
26+
import java.lang.reflect.Modifier;
27+
import java.util.*;
28+
import java.util.function.Predicate;
29+
import java.util.stream.Collectors;
30+
2431
import com.github.javaparser.ast.AccessSpecifier;
2532
import com.github.javaparser.ast.Node;
2633
import com.github.javaparser.resolution.Context;
@@ -39,13 +46,6 @@
3946
import com.github.javaparser.symbolsolver.logic.AbstractClassDeclaration;
4047
import com.github.javaparser.symbolsolver.reflectionmodel.comparators.MethodComparator;
4148

42-
import java.lang.reflect.Field;
43-
import java.lang.reflect.Method;
44-
import java.lang.reflect.Modifier;
45-
import java.util.*;
46-
import java.util.function.Predicate;
47-
import java.util.stream.Collectors;
48-
4949
/**
5050
* @author Federico Tomassetti
5151
*/
@@ -108,9 +108,7 @@ public boolean equals(Object o) {
108108

109109
ReflectionClassDeclaration that = (ReflectionClassDeclaration) o;
110110

111-
if (!clazz.getCanonicalName().equals(that.clazz.getCanonicalName())) return false;
112-
113-
return true;
111+
return clazz.getCanonicalName().equals(that.clazz.getCanonicalName());
114112
}
115113

116114
@Override
@@ -190,8 +188,8 @@ public SymbolReference<ResolvedMethodDeclaration> solveMethod(String name, List<
190188
}
191189

192190
// When empty there is no sense in trying to find the most applicable.
193-
// This is useful for debugging. Performance is not affected as
194-
// MethodResolutionLogic.findMostApplicable method returns very early
191+
// This is useful for debugging. Performance is not affected as
192+
// MethodResolutionLogic.findMostApplicable method returns very early
195193
// when candidateSolvedMethods is empty.
196194
if (candidateSolvedMethods.isEmpty()) {
197195
return SymbolReference.unsolved();
@@ -211,7 +209,8 @@ public ResolvedType getUsage(Node node) {
211209
return new ReferenceTypeImpl(this);
212210
}
213211

214-
public Optional<MethodUsage> solveMethodAsUsage(String name, List<ResolvedType> argumentsTypes, Context invokationContext, List<ResolvedType> typeParameterValues) {
212+
@Override
213+
public Optional<MethodUsage> solveMethodAsUsage(String name, List<ResolvedType> argumentsTypes, Context invokationContext, List<ResolvedType> typeParameterValues) {
215214
List<MethodUsage> methodUsages = new ArrayList<>();
216215

217216
List<Method> allMethods = Arrays.stream(clazz.getDeclaredMethods())

‎javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionEnumDeclaration.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -161,10 +161,7 @@ public boolean canBeAssignedTo(ResolvedReferenceTypeDeclaration other) {
161161
if (otherName.equals(JAVA_IO_SERIALIZABLE)) {
162162
return true;
163163
}
164-
if (other.isJavaLangObject()) {
165-
return true;
166-
}
167-
return false;
164+
return other.isJavaLangObject();
168165
}
169166

170167
@Override

‎javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionInterfaceDeclaration.java

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@
2121

2222
package com.github.javaparser.symbolsolver.reflectionmodel;
2323

24+
import java.lang.reflect.Field;
25+
import java.util.*;
26+
import java.util.stream.Collectors;
27+
2428
import com.github.javaparser.ast.AccessSpecifier;
2529
import com.github.javaparser.ast.Node;
2630
import com.github.javaparser.resolution.Context;
@@ -40,10 +44,6 @@
4044
import com.github.javaparser.symbolsolver.core.resolution.SymbolResolutionCapability;
4145
import com.github.javaparser.symbolsolver.logic.AbstractTypeDeclaration;
4246

43-
import java.lang.reflect.Field;
44-
import java.util.*;
45-
import java.util.stream.Collectors;
46-
4747
/**
4848
* @author Federico Tomassetti
4949
*/
@@ -131,19 +131,16 @@ public boolean equals(Object o) {
131131

132132
if (!clazz.getCanonicalName().equals(that.clazz.getCanonicalName())) return false;
133133

134-
if (!getTypeParameters().equals(that.getTypeParameters())) {
135-
return false;
136-
}
137-
138-
return true;
134+
return getTypeParameters().equals(that.getTypeParameters());
139135
}
140136

141137
@Override
142138
public int hashCode() {
143139
return clazz.hashCode();
144140
}
145141

146-
public Optional<MethodUsage> solveMethodAsUsage(String name, List<ResolvedType> parameterTypes,
142+
@Override
143+
public Optional<MethodUsage> solveMethodAsUsage(String name, List<ResolvedType> parameterTypes,
147144
Context invokationContext, List<ResolvedType> typeParameterValues) {
148145
Optional<MethodUsage> res = ReflectionMethodResolutionLogic.solveMethodAsUsage(name, parameterTypes, typeSolver, invokationContext,
149146
typeParameterValues, this, clazz);
@@ -193,12 +190,8 @@ && new ReflectionInterfaceDeclaration(clazz.getSuperclass(), typeSolver).canBeAs
193190
}
194191
}
195192

196-
if (other.isJavaLangObject()) {
197-
// Everything can be assigned to {@code java.lang.Object}
198-
return true;
199-
}
200-
201-
return false;
193+
// Everything can be assigned to {@code java.lang.Object}
194+
return other.isJavaLangObject();
202195
}
203196

204197
@Override
@@ -288,7 +281,7 @@ public List<ResolvedReferenceType> getInterfacesExtended() {
288281
}
289282
return res;
290283
}
291-
284+
292285
@Override
293286
public Optional<ResolvedReferenceTypeDeclaration> containerType() {
294287
return reflectionClassAdapter.containerType();

‎javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionTypeParameter.java

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,6 @@
2121

2222
package com.github.javaparser.symbolsolver.reflectionmodel;
2323

24-
import com.github.javaparser.resolution.TypeSolver;
25-
import com.github.javaparser.resolution.declarations.ResolvedMethodLikeDeclaration;
26-
import com.github.javaparser.resolution.declarations.ResolvedReferenceTypeDeclaration;
27-
import com.github.javaparser.resolution.declarations.ResolvedTypeParameterDeclaration;
28-
import com.github.javaparser.resolution.declarations.ResolvedTypeParametrizable;
29-
import com.github.javaparser.resolution.model.typesystem.ReferenceTypeImpl;
30-
import com.github.javaparser.resolution.types.ResolvedReferenceType;
31-
3224
import java.lang.reflect.Constructor;
3325
import java.lang.reflect.GenericDeclaration;
3426
import java.lang.reflect.Method;
@@ -38,6 +30,14 @@
3830
import java.util.Optional;
3931
import java.util.stream.Collectors;
4032

33+
import com.github.javaparser.resolution.TypeSolver;
34+
import com.github.javaparser.resolution.declarations.ResolvedMethodLikeDeclaration;
35+
import com.github.javaparser.resolution.declarations.ResolvedReferenceTypeDeclaration;
36+
import com.github.javaparser.resolution.declarations.ResolvedTypeParameterDeclaration;
37+
import com.github.javaparser.resolution.declarations.ResolvedTypeParametrizable;
38+
import com.github.javaparser.resolution.model.typesystem.ReferenceTypeImpl;
39+
import com.github.javaparser.resolution.types.ResolvedReferenceType;
40+
4141
/**
4242
* @author Federico Tomassetti
4343
*/
@@ -70,14 +70,11 @@ public boolean equals(Object o) {
7070
if (!getQualifiedName().equals(that.getQualifiedName())) {
7171
return false;
7272
}
73-
if (declaredOnType() != that.declaredOnType()) {
74-
return false;
75-
}
76-
if (declaredOnMethod() != that.declaredOnMethod()) {
77-
return false;
73+
if (declaredOnType() == that.declaredOnType()) {
74+
return true;
7875
}
7976
// TODO check bounds
80-
return true;
77+
return declaredOnMethod() == that.declaredOnMethod();
8178
}
8279

8380
@Override
@@ -107,7 +104,7 @@ public String getContainerId() {
107104
}
108105
return ((ResolvedMethodLikeDeclaration) container).getQualifiedSignature();
109106
}
110-
107+
111108
@Override
112109
public ResolvedTypeParametrizable getContainer() {
113110
return this.container;
@@ -132,7 +129,7 @@ public Optional<ResolvedReferenceTypeDeclaration> containerType() {
132129
}
133130
return Optional.empty();
134131
}
135-
132+
136133
@Override
137134
public ResolvedReferenceType object() {
138135
return new ReferenceTypeImpl(typeSolver.getSolvedJavaLangObject());

‎javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/resolution/naming/NameLogic.java

Lines changed: 6 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -592,24 +592,16 @@ private static boolean isSyntacticallyAPackageOrTypeName(Node name) {
592592

593593
// 2. In a type-import-on-demand declaration (§7.5.2)
594594

595-
if (whenParentIs(ImportDeclaration.class, name, (p, c) ->
596-
!p.isStatic() && p.isAsterisk() && p.getName() == name)) {
597-
return true;
598-
}
599-
600-
return false;
595+
return whenParentIs(ImportDeclaration.class, name, (p, c) ->
596+
!p.isStatic() && p.isAsterisk() && p.getName() == name);
601597
}
602598

603599
private static boolean isSyntacticallyAMethodName(Node name) {
604600
// A name is syntactically classified as a MethodName in this context:
605601
//
606602
// 1. Before the "(" in a method invocation expression (§15.12)
607603

608-
if (whenParentIs(MethodCallExpr.class, name, (p, c) -> p.getName() == c)) {
609-
return true;
610-
}
611-
612-
return false;
604+
return whenParentIs(MethodCallExpr.class, name, (p, c) -> p.getName() == c);
613605
}
614606

615607
private static boolean isSyntacticallyAModuleName(Node name) {
@@ -626,11 +618,8 @@ private static boolean isSyntacticallyAModuleName(Node name) {
626618
if (whenParentIs(ModuleExportsDirective.class, name, (p, c) -> p.getModuleNames().contains(name))) {
627619
return true;
628620
}
629-
if (whenParentIs(ModuleOpensDirective.class, name, (p, c) -> p.getModuleNames().contains(name))) {
630-
return true;
631-
}
632621

633-
return false;
622+
return whenParentIs(ModuleOpensDirective.class, name, (p, c) -> p.getModuleNames().contains(name));
634623
}
635624

636625
private static boolean isSyntacticallyAPackageName(Node name) {
@@ -644,12 +633,9 @@ private static boolean isSyntacticallyAPackageName(Node name) {
644633
return true;
645634
}
646635
// 2. To the left of the "." in a qualified PackageName
647-
if (whenParentIs(Name.class, name, (p, c) -> p.getQualifier().isPresent()
636+
return whenParentIs(Name.class, name, (p, c) -> p.getQualifier().isPresent()
648637
&& p.getQualifier().get() == name
649-
&& isSyntacticallyAPackageName(p))) {
650-
return true;
651-
}
652-
return false;
638+
&& isSyntacticallyAPackageName(p));
653639
}
654640

655641
private static boolean isSyntacticallyATypeName(Node name) {

0 commit comments

Comments
 (0)