Automated cleanup: inefficient branching (thanks IntelliJ)

hibernate-core/src/main/java/org/hibernate/dialect/AbstractPostgreSQLStructJdbcType.java

@@ -987,12 +987,7 @@ public abstract class AbstractPostgreSQLStructJdbcType implements AggregateJdbcT
 				}
 				else if ( value instanceof TemporalAccessor ) {
 					final TemporalAccessor temporalAccessor = (TemporalAccessor) value;
-					if ( temporalAccessor.isSupported( ChronoField.OFFSET_SECONDS ) ) {
+					appendAsTimestampWithMicros( appender, temporalAccessor, temporalAccessor.isSupported( ChronoField.OFFSET_SECONDS ), jdbcTimeZone );
-						appendAsTimestampWithMicros( appender, temporalAccessor, true, jdbcTimeZone );
-					}
-					else {
-						appendAsTimestampWithMicros( appender, temporalAccessor, false, jdbcTimeZone );
-					}
 				}
 				else {
 					appendAsTimestampWithMicros(

hibernate-core/src/main/java/org/hibernate/internal/util/CharSequenceHelper.java

@@ -44,9 +44,6 @@ public final class CharSequenceHelper {
 		}
 		else if ( charSequence instanceof SubSequence ) {
 			int idx = ( (SubSequence) charSequence ).lastIndexOf( c, fromIndex, endIndex );
-			if ( idx == -1 ) {
-				return -1;
-			}
 			return idx;
 		}
 		else {
@@ -72,9 +69,6 @@ public final class CharSequenceHelper {
 		}
 		else if ( charSequence instanceof SubSequence ) {
 			int idx = ( (SubSequence) charSequence ).indexOf( c, fromIndex, endIndex );
-			if ( idx == -1 ) {
-				return -1;
-			}
 			return idx;
 		}
 		else {
@@ -96,9 +90,6 @@ public final class CharSequenceHelper {
 		}
 		else if ( charSequence instanceof SubSequence ) {
 			int idx = ( (SubSequence) charSequence ).indexOf( target, fromIndex, endIndex );
-			if ( idx == -1 ) {
-				return -1;
-			}
 			return idx;
 		}
 		else {

hibernate-core/src/main/java/org/hibernate/metamodel/internal/JpaStaticMetaModelPopulationSetting.java

@@ -51,14 +51,9 @@ public enum JpaStaticMetaModelPopulationSetting {
 	}
 
 	private static String determineSetting(Map configurationValues) {
-		final String setting = ConfigurationHelper.getString(
+		return ConfigurationHelper.getString(
 				AvailableSettings.STATIC_METAMODEL_POPULATION,
 				configurationValues
 		);
-		if ( setting != null ) {
-			return setting;
-		}
-
-		return null;
 	}
 }

hibernate-core/src/main/java/org/hibernate/query/results/FromClauseAccessImpl.java

@@ -33,10 +33,7 @@ public class FromClauseAccessImpl implements FromClauseAccess {
 
 	public TableGroup findByAlias(String alias) {
 		if ( tableGroupBySqlAlias != null ) {
-			final TableGroup tableGroup = tableGroupBySqlAlias.get( alias );
+			return tableGroupBySqlAlias.get( alias );
-			if ( tableGroup != null ) {
-				return tableGroup;
-			}
 		}
 
 		return null;
@@ -51,9 +48,7 @@ public class FromClauseAccessImpl implements FromClauseAccess {
 	public TableGroup findTableGroup(NavigablePath navigablePath) {
 		if ( tableGroupByPath != null ) {
 			final TableGroup tableGroup = tableGroupByPath.get( navigablePath );
-			if ( tableGroup != null ) {
+			return tableGroup;
-				return tableGroup;
-			}
 		}
 
 		return null;

hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmExpressionHelper.java

@@ -172,9 +172,7 @@ public class SqmExpressionHelper {
 				return lhs;
 			}
 			final SqmPath<?> rhs = findPath( binaryArithmetic.getRightHandOperand(), nodeType );
-			if ( rhs != null ) {
+			return rhs;
-				return rhs;
-			}
 		}
 		return null;
 	}

hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/CollectionTableGroup.java

@@ -107,9 +107,7 @@ public class CollectionTableGroup extends StandardTableGroup implements PluralTa
 					tableExpression,
 					resolve
 			);
-			if ( elementTableReference != null ) {
+			return elementTableReference;
-				return elementTableReference;
-			}
 		}
 		return null;
 	}

hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/CorrelatedPluralTableGroup.java

@@ -93,9 +93,7 @@ public class CorrelatedPluralTableGroup extends CorrelatedTableGroup implements
 					tableExpression,
 					resolve
 			);
-			if ( elementTableReference != null ) {
+			return elementTableReference;
-				return elementTableReference;
-			}
 		}
 		return null;
 	}
@@ -129,9 +127,7 @@ public class CorrelatedPluralTableGroup extends CorrelatedTableGroup implements
 					tableExpression,
 					resolve
 			);
-			if ( elementTableReference != null ) {
+			return elementTableReference;
-				return elementTableReference;
-			}
 		}
 		return null;
 	}

hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/AbstractEmbeddableInitializer.java

@@ -286,10 +286,7 @@ public abstract class AbstractEmbeddableInitializer extends AbstractFetchParentA
 		}
 
 		final EntityInitializer entityInitializer = parentAccess.asEntityInitializer();
-		if ( entityInitializer != null && entityInitializer.getParentKey() == null ) {
+		return entityInitializer != null && entityInitializer.getParentKey() == null;
-			return true;
-		}
-		return false;
 	}
 
 	private void extractRowState(RowProcessingState processingState) {

tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/ImportContextImpl.java

@@ -84,12 +84,7 @@ public class ImportContextImpl implements ImportContext {
 		String simpleName = unqualify( fqcn );
 		if ( simpleNames.containsKey( simpleName ) ) {
 			String existingFqcn = simpleNames.get( simpleName );
-			if ( existingFqcn.equals( pureFqcn ) ) {
+			canBeSimple = existingFqcn.equals( pureFqcn );
-				canBeSimple = true;
-			}
-			else {
-				canBeSimple = false;
-			}
 		}
 		else {
 			canBeSimple = true;