Simplify if statements

britter · britter · commit 1756e676235d · 2013-08-09T17:09:37.000Z
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/csv/trunk@1512399 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/test/java/org/apache/commons/csv/TokenMatchers.java b/src/test/java/org/apache/commons/csv/TokenMatchers.java
@@ -40,10 +40,7 @@ protected boolean matchesSafely(final Token item,
                     final Description mismatchDescription) {
                 mismatchDescription.appendText("token type is ");
                 mismatchDescription.appendValue(item.type);
-                if (item.type == expectedType) {
-                    return true;
-                }
-                return false;
+                return item.type == expectedType;
             }
         };
     }
@@ -61,10 +58,7 @@ protected boolean matchesSafely(final Token item,
                     final Description mismatchDescription) {
                 mismatchDescription.appendText("token content is ");
                 mismatchDescription.appendValue(item.content.toString());
-                if (expectedContent.equals(item.content.toString())) {
-                    return true;
-                }
-                return false;
+                return expectedContent.equals(item.content.toString());
             }
         };
     }

Original file line number	Diff line number	Diff line change
`@@ -40,10 +40,7 @@ protected boolean matchesSafely(final Token item,`
`40`	`40`	`final Description mismatchDescription) {`
`41`	`41`	`mismatchDescription.appendText("token type is ");`
`42`	`42`	`mismatchDescription.appendValue(item.type);`
`43`		`- if (item.type == expectedType) {`
`44`		`- return true;`
`45`		`- }`
`46`		`- return false;`
	`43`	`+ return item.type == expectedType;`
`47`	`44`	`}`
`48`	`45`	`};`
`49`	`46`	`}`
`@@ -61,10 +58,7 @@ protected boolean matchesSafely(final Token item,`
`61`	`58`	`final Description mismatchDescription) {`
`62`	`59`	`mismatchDescription.appendText("token content is ");`
`63`	`60`	`mismatchDescription.appendValue(item.content.toString());`
`64`		`- if (expectedContent.equals(item.content.toString())) {`
`65`		`- return true;`
`66`		`- }`
`67`		`- return false;`
	`61`	`+ return expectedContent.equals(item.content.toString());`
`68`	`62`	`}`
`69`	`63`	`};`
`70`	`64`	`}`