HHH-19350 use UnaryOperator instead of Function

gavinking · gavinking · commit 696363e67038 · 2025-04-14T13:44:26.000+02:00
diff --git a/hibernate-core/src/main/java/org/hibernate/SessionBuilder.java b/hibernate-core/src/main/java/org/hibernate/SessionBuilder.java
@@ -6,7 +6,7 @@
 
 import java.sql.Connection;
 import java.util.TimeZone;
-import java.util.function.Function;
+import java.util.function.UnaryOperator;
 
 import org.hibernate.resource.jdbc.spi.PhysicalConnectionHandlingMode;
 import org.hibernate.resource.jdbc.spi.StatementInspector;
@@ -51,16 +51,17 @@ public interface SessionBuilder {
 	/**
 	 * Applies the given statement inspection function to the session.
 	 *
-	 * @param statementInspector A function which accepts a SQL string,
-	 *                           returning a possibly-processed SQL string
-	 *                           to be used by Hibernate instead of the
-	 *                           given SQL.
+	 * @param operator An operator which accepts a SQL string, returning
+	 *                 a processed SQL string to be used by Hibernate
+	 *                 instead of the given original SQL. Alternatively.
+	 *                 the operator may work by side effect, and simply
+	 *                 return the original SQL.
 	 *
 	 * @return {@code this}, for method chaining
 	 *
 	 * @since 7.0
 	 */
-	SessionBuilder statementInspector(Function<String,String> statementInspector);
+	SessionBuilder statementInspector(UnaryOperator<String> operator);
 
 	/**
 	 * Applies the given {@link StatementInspector} to the session.
@@ -70,7 +71,7 @@ public interface SessionBuilder {
 	 * @return {@code this}, for method chaining
 	 *
 	 * @deprecated This operation exposes the SPI type {@link StatementInspector}
-	 * and is therefore a layer-breaker. Use {@link #statementInspector(Function)}
+	 * and is therefore a layer-breaker. Use {@link #statementInspector(UnaryOperator)}
 	 * instead.
 	 */
 	@Deprecated(since = "7.0")
diff --git a/hibernate-core/src/main/java/org/hibernate/SharedSessionBuilder.java b/hibernate-core/src/main/java/org/hibernate/SharedSessionBuilder.java
@@ -9,7 +9,7 @@
 
 import java.sql.Connection;
 import java.util.TimeZone;
-import java.util.function.Function;
+import java.util.function.UnaryOperator;
 
 /**
  * Specialized {@link SessionBuilder} with access to stuff from another session.
@@ -76,7 +76,7 @@ public interface SharedSessionBuilder extends SessionBuilder {
 	SharedSessionBuilder statementInspector(StatementInspector statementInspector);
 
 	@Override
-	SessionBuilder statementInspector(Function<String, String> statementInspector);
+	SessionBuilder statementInspector(UnaryOperator<String> operator);
 
 	@Override @Deprecated
 	SharedSessionBuilder connectionHandlingMode(PhysicalConnectionHandlingMode mode);
diff --git a/hibernate-core/src/main/java/org/hibernate/StatelessSessionBuilder.java b/hibernate-core/src/main/java/org/hibernate/StatelessSessionBuilder.java
@@ -5,7 +5,7 @@
 package org.hibernate;
 
 import java.sql.Connection;
-import java.util.function.Function;
+import java.util.function.UnaryOperator;
 
 import org.hibernate.resource.jdbc.spi.StatementInspector;
 
@@ -57,18 +57,19 @@ public interface StatelessSessionBuilder {
 	/**
 	 * Applies the given statement inspection function to the session.
 	 *
-	 * @param statementInspector A function which accepts a SQL string,
-	 *                           returning a possibly-processed SQL string
-	 *                           to be used by Hibernate instead of the
-	 *                           given SQL.
+	 * @param operator An operator which accepts a SQL string, returning
+	 *                 a processed SQL string to be used by Hibernate
+	 *                 instead of the given original SQL. Alternatively.
+	 *                 the operator may work by side effect, and simply
+	 *                 return the original SQL.
 	 *
 	 * @return {@code this}, for method chaining
 	 *
 	 * @apiNote This operation exposes the SPI type
 	 *          {@link StatementInspector}
 	 *          and is therefore a layer-breaker.
 	 */
-	StatelessSessionBuilder statementInspector(Function<String,String> statementInspector);
+	StatelessSessionBuilder statementInspector(UnaryOperator<String> operator);
 
 	/**
 	 * Applies the given {@link StatementInspector} to the session.
@@ -78,7 +79,7 @@ public interface StatelessSessionBuilder {
 	 * @return {@code this}, for method chaining
 	 *
 	 * @deprecated This operation exposes the SPI type{@link StatementInspector}
-	 * and is therefore a layer-breaker. Use {@link #statementInspector(Function)}
+	 * and is therefore a layer-breaker. Use {@link #statementInspector(UnaryOperator)}
 	 * instead.
 	 */
 	@Deprecated(since = "7.0")
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/AbstractDelegatingSessionBuilder.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/AbstractDelegatingSessionBuilder.java
@@ -6,7 +6,7 @@
 
 import java.sql.Connection;
 import java.util.TimeZone;
-import java.util.function.Function;
+import java.util.function.UnaryOperator;
 
 import org.hibernate.ConnectionAcquisitionMode;
 import org.hibernate.ConnectionReleaseMode;
@@ -65,8 +65,8 @@ public SessionBuilder statementInspector(StatementInspector statementInspector)
 	}
 
 	@Override
-	public SessionBuilder statementInspector(Function<String, String> statementInspector) {
-		delegate.statementInspector( statementInspector );
+	public SessionBuilder statementInspector(UnaryOperator<String> operator) {
+		delegate.statementInspector( operator );
 		return this;
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/AbstractDelegatingSharedSessionBuilder.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/AbstractDelegatingSharedSessionBuilder.java
@@ -6,7 +6,7 @@
 
 import java.sql.Connection;
 import java.util.TimeZone;
-import java.util.function.Function;
+import java.util.function.UnaryOperator;
 
 import org.hibernate.ConnectionAcquisitionMode;
 import org.hibernate.ConnectionReleaseMode;
@@ -102,8 +102,8 @@ public SharedSessionBuilder statementInspector(StatementInspector statementInspe
 	}
 
 	@Override
-	public SessionBuilder statementInspector(Function<String, String> statementInspector) {
-		delegate.statementInspector( statementInspector );
+	public SessionBuilder statementInspector(UnaryOperator<String> operator) {
+		delegate.statementInspector( operator );
 		return this;
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java b/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java
@@ -21,6 +21,7 @@
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.function.Supplier;
+import java.util.function.UnaryOperator;
 import javax.naming.Reference;
 import javax.naming.StringRefAddr;
 
@@ -1280,8 +1281,8 @@ public SessionBuilderImpl statementInspector(StatementInspector statementInspect
 		}
 
 		@Override
-		public SessionBuilder statementInspector(Function<String, String> statementInspector) {
-			this.statementInspector = statementInspector::apply;
+		public SessionBuilder statementInspector(UnaryOperator<String> operator) {
+			this.statementInspector = operator::apply;
 			return this;
 		}
 
@@ -1422,8 +1423,8 @@ public StatelessSessionBuilder statementInspector(StatementInspector statementIn
 		}
 
 		@Override
-		public StatelessSessionBuilder statementInspector(Function<String, String> statementInspector) {
-			this.statementInspector = statementInspector::apply;
+		public StatelessSessionBuilder statementInspector(UnaryOperator<String> operator) {
+			this.statementInspector = operator::apply;
 			return this;
 		}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/SessionImpl.java b/hibernate-core/src/main/java/org/hibernate/internal/SessionImpl.java
@@ -22,7 +22,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.TimeZone;
-import java.util.function.Function;
+import java.util.function.UnaryOperator;
 
 import jakarta.persistence.PessimisticLockScope;
 import jakarta.persistence.Timeout;
@@ -2149,20 +2149,23 @@ public SharedSessionBuilderImpl connection(Connection connection) {
 			return this;
 		}
 
+		private PhysicalConnectionHandlingMode getConnectionHandlingMode() {
+			return session.getJdbcCoordinator().getLogicalConnection().getConnectionHandlingMode();
+		}
+
 		@Override
 		@Deprecated(since = "6.0")
 		public SharedSessionBuilderImpl connectionReleaseMode() {
-			final PhysicalConnectionHandlingMode handlingMode = PhysicalConnectionHandlingMode.interpret(
-					ConnectionAcquisitionMode.AS_NEEDED,
-					session.getJdbcCoordinator().getLogicalConnection().getConnectionHandlingMode().getReleaseMode()
-			);
+			final PhysicalConnectionHandlingMode handlingMode =
+					PhysicalConnectionHandlingMode.interpret( ConnectionAcquisitionMode.AS_NEEDED,
+							getConnectionHandlingMode().getReleaseMode() );
 			connectionHandlingMode( handlingMode );
 			return this;
 		}
 
 		@Override
 		public SharedSessionBuilderImpl connectionHandlingMode() {
-			connectionHandlingMode( session.getJdbcCoordinator().getLogicalConnection().getConnectionHandlingMode() );
+			connectionHandlingMode( getConnectionHandlingMode() );
 			return this;
 		}
 
@@ -2233,8 +2236,8 @@ public SharedSessionBuilderImpl statementInspector(StatementInspector statementI
 		}
 
 		@Override
-		public SessionBuilder statementInspector(Function<String, String> statementInspector) {
-			super.statementInspector(statementInspector);
+		public SessionBuilder statementInspector(UnaryOperator<String> operator) {
+			super.statementInspector(operator);
 			return this;
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@`
`21`	`21`	`import java.util.function.Consumer;`
`22`	`22`	`import java.util.function.Function;`
`23`	`23`	`import java.util.function.Supplier;`
	`24`	`+import java.util.function.UnaryOperator;`
`24`	`25`	`import javax.naming.Reference;`
`25`	`26`	`import javax.naming.StringRefAddr;`
`26`	`27`
`@@ -1280,8 +1281,8 @@ public SessionBuilderImpl statementInspector(StatementInspector statementInspect`
`1280`	`1281`	`}`
`1281`	`1282`
`1282`	`1283`	`@Override`
`1283`		`- public SessionBuilder statementInspector(Function<String, String> statementInspector) {`
`1284`		`- this.statementInspector = statementInspector::apply;`
	`1284`	`+ public SessionBuilder statementInspector(UnaryOperator<String> operator) {`
	`1285`	`+ this.statementInspector = operator::apply;`
`1285`	`1286`	`return this;`
`1286`	`1287`	`}`
`1287`	`1288`
`@@ -1422,8 +1423,8 @@ public StatelessSessionBuilder statementInspector(StatementInspector statementIn`
`1422`	`1423`	`}`
`1423`	`1424`
`1424`	`1425`	`@Override`
`1425`		`- public StatelessSessionBuilder statementInspector(Function<String, String> statementInspector) {`
`1426`		`- this.statementInspector = statementInspector::apply;`
	`1426`	`+ public StatelessSessionBuilder statementInspector(UnaryOperator<String> operator) {`
	`1427`	`+ this.statementInspector = operator::apply;`
`1427`	`1428`	`return this;`
`1428`	`1429`	`}`
`1429`	`1430`