refactor: simplify 'if' statement (#2392)

* refactor: simplify 'if' in CtExecutableReferenceImpl.java * refactor: simplify 'if' in CtParameterRemoveRefactoring.java * refactor: simplify 'if' in CtTypeParameterReferenceImpl.java * refactor: simplify 'if' in DefaultJavaPrettyPrinter.java * refactor: simplify 'if' in ForEachNode.java * refactor: simplify 'if' in ForEachNode.java * refactor: simplify 'if' in SwitchNode.java * refactor: simplify 'if' in SubInheritanceHierarchyResolver.java * refactor: simplify 'if' in PatternPrinter.java * refactor: simplify 'if' in MinimalImportScanner.java * refactor: simplify 'if' in MapEntryNode.java * refactor: simplify 'if' in ImportScannerImpl.java * refactor: simplify 'if' in Parameters.java * refactor: simplify 'if' in VisitorPartialEvaluator.java * refactor: simplify 'if' in TemplateBuilder.java * refactor: simplify 'if' in CtTypeImpl.java * refactor: simplify 'if' in MMMethodKind.java * refactor: fix checkstyle in CtTypeImpl.java * refactor: remove redundant try-catch * Remove leftover from 'catch'
INRIA · Aug 20, 2018 · 88fe903 · 88fe903
1 parent e4e2a02
commit 88fe903
Show file tree

Hide file tree

Showing 17 changed files with 26 additions and 90 deletions.
diff --git a/src/main/java/spoon/metamodel/MMMethodKind.java b/src/main/java/spoon/metamodel/MMMethodKind.java
@@ -43,9 +43,7 @@ public enum MMMethodKind {
 	ADD_FIRST(0, true, 10, m -> {
 		if (m.getParameters().size() == 1) {
 			if (m.getSimpleName().startsWith("add") || m.getSimpleName().startsWith("insert")) {
-				if (m.getSimpleName().endsWith("AtTop") || m.getSimpleName().endsWith("Begin")) {
-					return true;
-				}
+				return m.getSimpleName().endsWith("AtTop") || m.getSimpleName().endsWith("Begin");
 			}
 		}
 		return false;
@@ -55,9 +53,7 @@ public enum MMMethodKind {
 	 */
 	ADD_LAST(0, true,  1, m -> {
 		if (m.getParameters().size() == 1) {
-			if (m.getSimpleName().startsWith("add") || m.getSimpleName().startsWith("insert")) {
-				return true;
-			}
+			return m.getSimpleName().startsWith("add") || m.getSimpleName().startsWith("insert");
 		}
 		return false;
 	}),
@@ -66,9 +62,7 @@ public enum MMMethodKind {
 	 */
 	ADD_ON(1, true, 1, m -> {
 		if (m.getParameters().size() == 2 && "int".equals(m.getParameters().get(0).getType().getSimpleName())) {
-			if (m.getSimpleName().startsWith("add") || m.getSimpleName().startsWith("insert")) {
-				return true;
-			}
+			return m.getSimpleName().startsWith("add") || m.getSimpleName().startsWith("insert");
 		}
 		return false;
 	}),

diff --git a/src/main/java/spoon/pattern/internal/PatternPrinter.java b/src/main/java/spoon/pattern/internal/PatternPrinter.java
@@ -115,9 +115,7 @@ private boolean isCommentVisible(Object obj) {
 		if (obj instanceof CtElement) {
 			MetamodelConcept mmType = Metamodel.getInstance().getConcept((Class) obj.getClass());
 			MetamodelProperty mmCommentField = mmType.getProperty(CtRole.COMMENT);
-			if (mmCommentField != null && mmCommentField.isDerived() == false) {
-				return true;
-			}
+			return mmCommentField != null && mmCommentField.isDerived() == false;
 		}
 		return false;
 	}

diff --git a/src/main/java/spoon/pattern/internal/node/ForEachNode.java b/src/main/java/spoon/pattern/internal/node/ForEachNode.java
@@ -69,10 +69,7 @@ public boolean replaceNode(RootNode oldNode, RootNode newNode) {
 			nestedModel = newNode;
 			return true;
 		}
-		if (nestedModel.replaceNode(oldNode, newNode)) {
-			return true;
-		}
-		return false;
+		return nestedModel.replaceNode(oldNode, newNode);
 	}
 
 	@Override

diff --git a/src/main/java/spoon/pattern/internal/node/MapEntryNode.java b/src/main/java/spoon/pattern/internal/node/MapEntryNode.java
@@ -63,10 +63,7 @@ public boolean replaceNode(RootNode oldNode, RootNode newNode) {
 		if (key.replaceNode(oldNode, newNode)) {
 			return true;
 		}
-		if (value.replaceNode(oldNode, newNode)) {
-			return true;
-		}
-		return false;
+		return value.replaceNode(oldNode, newNode);
 	}
 
 	@Override

diff --git a/src/main/java/spoon/pattern/internal/node/SwitchNode.java b/src/main/java/spoon/pattern/internal/node/SwitchNode.java
@@ -147,9 +147,7 @@ public boolean replaceNode(RootNode oldNode, RootNode newNode) {
 					statement = newNode;
 					return true;
 				}
-				if (statement.replaceNode(oldNode, newNode)) {
-					return true;
-				}
+				return statement.replaceNode(oldNode, newNode);
 			}
 			return false;
 		}

diff --git a/src/main/java/spoon/refactoring/CtParameterRemoveRefactoring.java b/src/main/java/spoon/refactoring/CtParameterRemoveRefactoring.java
@@ -213,10 +213,7 @@ private void checkInvocation(CtInvocation<?> invocation) {
 	 * @return true if it is allowed parameter use
 	 */
 	protected boolean isAllowedParameterUsage(CtParameterReference<?> paramRef) {
-		if (isRemovedParamOfRefactoredInvocation(paramRef)) {
-			return true;
-		}
-		return false;
+		return isRemovedParamOfRefactoredInvocation(paramRef);
 	}
 
 	/**

diff --git a/src/main/java/spoon/reflect/visitor/DefaultJavaPrettyPrinter.java b/src/main/java/spoon/reflect/visitor/DefaultJavaPrettyPrinter.java
@@ -909,15 +909,12 @@ private <T> boolean isInitializeStaticFinalField(CtExpression<T> targetExp) {
 		} catch (ParentNotInitializedException e) {
 			return false;
 		}
-		if (parent instanceof CtFieldWrite
+		return parent instanceof CtFieldWrite
 				&& targetExp.equals(((CtFieldWrite) parent).getTarget())
 				&& anonymousParent != null
 				&& ((CtFieldWrite) parent).getVariable() != null
 				&& ((CtFieldWrite) parent).getVariable().getModifiers().contains(ModifierKind.STATIC)
-				&& ((CtFieldWrite) parent).getVariable().getModifiers().contains(ModifierKind.FINAL)) {
-			return true;
-		}
-		return false;
+				&& ((CtFieldWrite) parent).getVariable().getModifiers().contains(ModifierKind.FINAL);
 	}
 
 	@Override

diff --git a/src/main/java/spoon/reflect/visitor/ImportScannerImpl.java b/src/main/java/spoon/reflect/visitor/ImportScannerImpl.java
@@ -509,9 +509,7 @@ protected boolean isImportedInClassImports(CtTypeReference<?> ref) {
 
 		if (!(ref.isImplicit()) && classImports.containsKey(ref.getSimpleName())) {
 			CtTypeReference<?> exist = classImports.get(ref.getSimpleName());
-			if (exist.getQualifiedName().equals(ref.getQualifiedName())) {
-				return true;
-			}
+			return exist.getQualifiedName().equals(ref.getQualifiedName());
 		}
 		return false;
 	}
@@ -609,11 +607,7 @@ protected boolean isImportedInMethodImports(CtExecutableReference<?> ref) {
 
 		if (!(ref.isImplicit()) && methodImports.containsKey(ref.getSimpleName())) {
 			CtExecutableReference<?> exist = methodImports.get(ref.getSimpleName());
-			if (getSignature(exist).equals(
-					getSignature(ref))
-					) {
-				return true;
-			}
+			return getSignature(exist).equals(getSignature(ref));
 		}
 		return false;
 	}

diff --git a/src/main/java/spoon/reflect/visitor/MinimalImportScanner.java b/src/main/java/spoon/reflect/visitor/MinimalImportScanner.java
@@ -107,9 +107,7 @@ protected boolean addMethodImport(CtExecutableReference ref) {
 	protected boolean isImportedInClassImports(CtTypeReference<?> ref) {
 		if (!(ref.isImplicit()) && classImports.containsKey(ref.getSimpleName())) {
 			CtTypeReference<?> exist = classImports.get(ref.getSimpleName());
-			if (exist.getQualifiedName().equals(ref.getQualifiedName())) {
-				return true;
-			}
+			return exist.getQualifiedName().equals(ref.getQualifiedName());
 		}
 		return false;
 	}

diff --git a/src/main/java/spoon/support/compiler/jdt/JDTBasedSpoonCompiler.java b/src/main/java/spoon/support/compiler/jdt/JDTBasedSpoonCompiler.java
@@ -95,17 +95,7 @@ public JDTBasedSpoonCompiler(Factory factory) {
 	}
 
 	private void initializeCUCOmparator() {
-		try {
-			if (System.getenv("SPOON_SEED_CU_COMPARATOR") != null) {
-				this.sortList = false;
-			} else {
-				this.sortList = true;
-			}
-		} catch (NumberFormatException | SecurityException e) {
-			Launcher.LOGGER.error("Error while parsing Spoon seed for CU sorting", e);
-			this.sortList = true;
-		}
-
+		this.sortList = System.getenv("SPOON_SEED_CU_COMPARATOR") == null;
 	}
 
 	@Override

diff --git a/src/main/java/spoon/support/reflect/declaration/CtTypeImpl.java b/src/main/java/spoon/support/reflect/declaration/CtTypeImpl.java
@@ -785,14 +785,10 @@ private boolean isSameParameter(CtMethod<?> method, CtTypeReference<?> ctParamet
 		}
 		if (expectedType instanceof CtTypeParameterReference && ctParameterType instanceof CtTypeParameterReference) {
 			// both types are generic
-			if (!ctParameterType.equals(expectedType)) {
-				return false;
-			}
+			return ctParameterType.equals(expectedType);
 		} else if (expectedType instanceof CtTypeParameterReference) {
 			// expectedType type is generic, ctParameterType is real type
-			if (!expectedType.getTypeErasure().getQualifiedName().equals(ctParameterType.getQualifiedName())) {
-				return false;
-			}
+			return expectedType.getTypeErasure().getQualifiedName().equals(ctParameterType.getQualifiedName());
 		} else if (ctParameterType instanceof CtTypeParameterReference) {
 			// ctParameterType is generic, expectedType type is real type
 			CtTypeParameter declaration = (CtTypeParameter) ctParameterType.getDeclaration();
@@ -806,10 +802,9 @@ private boolean isSameParameter(CtMethod<?> method, CtTypeReference<?> ctParamet
 				return declaration.getSuperclass().equals(expectedType);
 			} else {
 				return getFactory().Type().objectType().equals(expectedType);
-			}
-		} else if (!expectedType.getQualifiedName().equals(ctParameterType.getQualifiedName())) {
-			// both are real types
-			return false;
+			} // both are real types
+		} else {
+			return expectedType.getQualifiedName().equals(ctParameterType.getQualifiedName());
 		}
 		return true;
 	}

diff --git a/src/main/java/spoon/support/reflect/eval/VisitorPartialEvaluator.java b/src/main/java/spoon/support/reflect/eval/VisitorPartialEvaluator.java
@@ -463,10 +463,7 @@ private boolean isLiteralType(Object object) {
 		if (object instanceof Character) {
 			return true;
 		}
-		if (object instanceof Class) {
-			return true;
-		}
-		return false;
+		return object instanceof Class;
 	}
 
 	@Override

diff --git a/src/main/java/spoon/support/reflect/reference/CtExecutableReferenceImpl.java b/src/main/java/spoon/support/reflect/reference/CtExecutableReferenceImpl.java
@@ -218,10 +218,7 @@ public boolean isOverriding(CtExecutableReference<?> executable) {
 				return false;
 			}
 			CtTypeReference<?> declaringType = getDeclaringType();
-			if (declaringType == null || !declaringType.isSubtypeOf(executable.getDeclaringType())) {
-				return false;
-			}
-			return true;
+			return declaringType != null && declaringType.isSubtypeOf(executable.getDeclaringType());
 		}
 		if (exec instanceof CtMethod<?> && thisExec instanceof CtMethod<?>) {
 			return new ClassTypingContext(((CtTypeMember) thisExec).getDeclaringType()).isOverriding((CtMethod<?>) thisExec, (CtMethod<?>) exec);

diff --git a/src/main/java/spoon/support/reflect/reference/CtTypeParameterReferenceImpl.java b/src/main/java/spoon/support/reflect/reference/CtTypeParameterReferenceImpl.java
@@ -286,9 +286,6 @@ public boolean isGenerics() {
 		if (getDeclaration() instanceof CtTypeParameter) {
 			return true;
 		}
-		if (getBoundingType() != null && getBoundingType().isGenerics()) {
-			return true;
-		}
-		return false;
+		return getBoundingType() != null && getBoundingType().isGenerics();
 	}
 }
diff --git a/src/main/java/spoon/support/template/Parameters.java b/src/main/java/spoon/support/template/Parameters.java
@@ -284,11 +284,8 @@ public static boolean isParameterSource(CtFieldReference<?> ref) {
 			//the reference to this is not template parameter
 			return false;
 		}
-		if (ref.getType().isSubtypeOf(getTemplateParameterType(ref.getFactory()))) {
-			//the type of template field is TemplateParameter.
-			return true;
-		}
-		return false;
+		//the type of template field is TemplateParameter.
+		return ref.getType().isSubtypeOf(getTemplateParameterType(ref.getFactory()));
 	}
 
 	/**

diff --git a/src/main/java/spoon/support/visitor/SubInheritanceHierarchyResolver.java b/src/main/java/spoon/support/visitor/SubInheritanceHierarchyResolver.java
@@ -218,10 +218,7 @@ public void accept(CtType<?> type) {
 	private static final Filter<CtType<?>> typeFilter = new Filter<CtType<?>>() {
 		@Override
 		public boolean matches(CtType<?> type) {
-			if (type instanceof CtTypeParameter) {
-				return false;
-			}
-			return true;
+			return !(type instanceof CtTypeParameter);
 		}
 	};
 

diff --git a/src/main/java/spoon/template/TemplateBuilder.java b/src/main/java/spoon/template/TemplateBuilder.java
@@ -96,11 +96,7 @@ public static TemplateBuilder createPattern(CtElement templateRoot, CtClass<?> t
 						return false;
 					}
 					//remove all Fields of type TemplateParameter
-					if (typeMember instanceof CtField<?> && ((CtField<?>) typeMember).getType().isSubtypeOf(templateParamRef)) {
-						return false;
-					}
-					//all other type members have to be part of the pattern model
-					return true;
+					return !(typeMember instanceof CtField<?>) || !((CtField<?>) typeMember).getType().isSubtypeOf(templateParamRef);
 				});
 				//remove `... extends Template`, which doesn't have to be part of pattern model
 				tv.removeSuperClass();