No effective change - code cleanup - simplify if

src/main/java/com/avaje/ebeaninternal/server/deploy/DRawSqlSelectBuilder.java

@@ -90,13 +90,11 @@ public class DRawSqlSelectBuilder {
 			debug("Parsing sql-select in " + getErrName());
 		}
 
-		if (hasPlaceHolders()) {
-
-		} else {
-			// parse the sql for the keywords...
-			// select, from, where, having, group by, order by
-			parseSqlFindKeywords(true);
-		}
+    if (!hasPlaceHolders()) {
+      // parse the sql for the keywords...
+      // select, from, where, having, group by, order by
+      parseSqlFindKeywords(true);
+    }
 
     List<DRawSqlColumnInfo> selectColumns = findSelectColumns(meta.getColumnMapping());
 		whereExprPos = findWhereExprPosition();
@@ -140,16 +138,7 @@ public class DRawSqlSelectBuilder {
 	}
 
 	private boolean hasPlaceHolders() {
-		if (placeHolderWhere > -1) {
-			return true;
-		}
-		if (placeHolderAndWhere > -1) {
-			return true;
-		}
-		if (placeHolderHaving > -1) {
-			return true;
-		}
-    return placeHolderAndHaving > -1;
+    return placeHolderWhere > -1 || placeHolderAndWhere > -1 || placeHolderHaving > -1 || placeHolderAndHaving > -1;
   }
 
 	/**

src/main/java/com/avaje/ebeaninternal/server/deploy/DRawSqlSelectColumnsParser.java

@@ -212,10 +212,7 @@ public final class DRawSqlSelectColumnsParser {
 	}
 
 	private boolean isMatch(BeanProperty prop, String columnLabel) {
-		if (columnLabel.equalsIgnoreCase(prop.getDbColumn())) {
-			return true;
-		}
-    return columnLabel.equalsIgnoreCase(prop.getName());
+    return columnLabel.equalsIgnoreCase(prop.getDbColumn()) || columnLabel.equalsIgnoreCase(prop.getName());
   }
 
 	private int nextComma() {

src/main/java/com/avaje/ebeaninternal/server/deploy/DeployParser.java

@@ -161,14 +161,8 @@ public abstract class DeployParser {
 	 * return true if the char is a letter, digit or underscore.
 	 */
 	private boolean isWordPart(char ch) {
-		if (Character.isLetterOrDigit(ch)) {
-			return true;
-
-		} else if (ch == UNDERSCORE) {
-			return true;
-
-		} else return ch == PERIOD;
-	}
+    return Character.isLetterOrDigit(ch) || ch == UNDERSCORE || ch == PERIOD;
+  }
 
 	private boolean isWordStart(char ch) {
     return Character.isLetter(ch);