Merge branch 'main' into fix/npe-entity-entry-context

Author: werner77

checkerstubs/jakarta.persistence.astub

@@ -3,6 +3,7 @@
 package jakarta.persistence;
 
 import org.checkerframework.checker.nullness.qual.Nullable;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 public interface AttributeConverter<X,Y> {
 	public @Nullable Y convertToDatabaseColumn(@Nullable X attribute);
@@ -20,9 +21,10 @@ public interface EntityManagerFactory extends AutoCloseable {
 public interface EntityTransaction {
 	@Nullable Integer getTimeout();
 }
-public interface Parameter {
-	public @Nullable String getName();
-	public @Nullable Integer getPosition();
+public interface Parameter<T> {
+	@Nullable String getName();
+	@Nullable Integer getPosition();
+	@Nullable Class<T> getParameterType();
 }
 public interface PersistenceUnitUtil extends PersistenceUtil {
 	public @Nullable Object getIdentifier(Object entity);
@@ -86,9 +88,9 @@ public interface CommonAbstractCriteria {
 }
 public interface AbstractQuery<T> extends CommonAbstractCriteria {
 	AbstractQuery<T> where(@Nullable Expression<Boolean> restriction);
-    AbstractQuery<T> where(@Nullable Predicate... restrictions);
+    AbstractQuery<T> where(Predicate @Nullable... restrictions);
     AbstractQuery<T> having(@Nullable Expression<Boolean> restriction);
-    AbstractQuery<T> having(@Nullable Predicate... restrictions);
+    AbstractQuery<T> having(Predicate @Nullable... restrictions);
 	@Nullable Selection<T> getSelection();
 	@Nullable Predicate getGroupRestriction();
 }
@@ -99,12 +101,18 @@ public interface CriteriaUpdate<T> extends CommonAbstractCriteria {
 }
 public interface Subquery<T> extends AbstractQuery<T>, Expression<T> {
 	Subquery<T> where(@Nullable Expression<Boolean> restriction);
-    Subquery<T> where(@Nullable Predicate... restrictions);
+    Subquery<T> where(Predicate @Nullable... restrictions);
     Subquery<T> having(@Nullable Expression<Boolean> restriction);
-    Subquery<T> having(@Nullable Predicate... restrictions);
+    Subquery<T> having(Predicate @Nullable... restrictions);
 	@Nullable Expression<T> getSelection();
 }
 public interface CriteriaBuilder {
+    interface In<T> extends Predicate {
+        In<T> value(@NonNull T value);
+    }
+    interface Coalesce<T> extends Expression<T> {
+        Coalesce<T> value(@Nullable T value);
+    }
 	public static interface SimpleCase<C,R> extends Expression<R> {
 		SimpleCase<C, R> when(C condition, @Nullable R result);
 		SimpleCase<C, R> when(Expression<? extends C> condition, @Nullable R result);
@@ -117,26 +125,28 @@ public interface CriteriaBuilder {
 }
 public interface Join<Z, X> extends From<Z, X> {
 	Join<Z, X> on(@Nullable Expression<Boolean> restriction);
-    Join<Z, X> on(@Nullable Predicate... restrictions);
+    Join<Z, X> on(Predicate @Nullable... restrictions);
     @Nullable Predicate getOn();
+    @Nullable From<?, Z> getParent();
+    @Nullable Attribute<? super Z, ?> getAttribute();
 }
 public interface SetJoin<Z,E> extends PluralJoin<Z, Set<E>, E> {
 	SetJoin<Z, E> on(@Nullable Expression<Boolean> restriction);
-    SetJoin<Z, E> on(@Nullable Predicate... restrictions);
+    SetJoin<Z, E> on(Predicate @Nullable... restrictions);
 }
 public interface ListJoin<Z,E> extends PluralJoin<Z, List<E>, E> {
 	ListJoin<Z, E> on(@Nullable Expression<Boolean> restriction);
-    ListJoin<Z, E> on(@Nullable Predicate... restrictions);
+    ListJoin<Z, E> on(Predicate @Nullable... restrictions);
 }
 public interface MapJoin<Z,K,V> extends PluralJoin<Z, Map<K,V>, V> {
 	MapJoin<Z,K,V> on(@Nullable Expression<Boolean> restriction);
-    MapJoin<Z,K,V> on(@Nullable Predicate... restrictions);
+    MapJoin<Z,K,V> on(Predicate @Nullable... restrictions);
 }
 public interface Path<X> extends Expression<X> {
 	// CteRoot etc.
 	@Nullable Bindable<X> getModel();
 	@Nullable Path<?> getParentPath();
-    MapJoin<Z,K,V> on(@Nullable Predicate... restrictions);
+    MapJoin<Z,K,V> on(Predicate @Nullable... restrictions);
 }
 
 package jakarta.persistence.metamodel;

checkerstubs/jboss.logging.astub

@@ -11,4 +11,14 @@ public interface BasicLogger {
 public interface Logger {
     void tracev(String format, @Nullable Object param1);
     void tracef(String format, @Nullable Object param1);
+    void tracev(String format, @Nullable Object param1, @Nullable Object param2);
+    void tracef(String format, @Nullable Object param1, @Nullable Object param2);
+    void warnv(String format, @Nullable Object param1);
+    void warnf(String format, @Nullable Object param1);
+    void warnv(String format, @Nullable Object param1, @Nullable Object param2);
+    void warnf(String format, @Nullable Object param1, @Nullable Object param2);
+    void debugv(String format, @Nullable Object param1);
+    void debugf(String format, @Nullable Object param1);
+    void debugv(String format, @Nullable Object param1, @Nullable Object param2);
+    void debugf(String format, @Nullable Object param1, @Nullable Object param2);
 }

documentation/src/main/asciidoc/introduction/Introduction.adoc

@@ -23,6 +23,14 @@ The goal of _object/relational mapping_ (ORM) is to eliminate fragile and untype
 ORM takes the pain out of persistence by relieving the developer of the need to hand-write tedious, repetitive, and fragile code for flattening graphs of objects to database tables and rebuilding graphs of objects from flat SQL query result sets.
 Even better, ORM makes it much easier to tune performance later, after the basic persistence logic has already been written.
 
+Actually, the problem that object/relational mapping solves has been mischaracterized for decades, and has very little to do with any so-called "mismatch" between classes and tables. The real problem is:
+
+1. Data is stored in **normalized tables**.
+2. The process of efficiently reading data from tables **<<join-fetch,denormalizes the data with joins>>**.
+3. In an object-oriented program, we often want to work with data in something quite close to its **original normalized form**.
+
+Therefore, the principal task of object/relational mapping is to _renormalize the data after reading it from the database_. This need exists even if the classes in our program are identical to the database tables.
+
 [TIP]
 // .ORM or SQL?
 ====

documentation/src/main/asciidoc/userguide/chapters/domain/collections.adoc

@@ -285,7 +285,7 @@ is available to have Hibernate interpret a `List` with no `@OrderColumn` and no
 An ID_BAG is similar to a BAG, except that it maps a generated, per-row identifier into the collection
 table.  `@CollectionId` is the annotation to configure this identifier.
 
-For details about defining an id-bad identifier, see the Javadocs for:
+For details about defining an id-bag identifier, see the Javadocs for:
 
 * link:{javadoc-base}/org/hibernate/annotations/CollectionId.html[@CollectionId]
 * link:{javadoc-base}/org/hibernate/annotations/CollectionIdJavaClass.html[@CollectionIdJavaClass]

hibernate-agroal/src/test/java/org/hibernate/test/agroal/AgroalSkipAutoCommitTest.java

@@ -4,6 +4,9 @@
  */
 package org.hibernate.test.agroal;
 
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+
 import org.hibernate.test.agroal.util.PreparedStatementSpyConnectionProvider;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.ServiceRegistry;
@@ -12,8 +15,6 @@
 import org.hibernate.testing.orm.junit.Setting;
 import org.hibernate.testing.orm.junit.SettingProvider;
 
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
 import org.junit.jupiter.api.Test;
 
 import java.sql.Connection;
@@ -23,8 +24,8 @@
 import static org.hibernate.cfg.JdbcSettings.AUTOCOMMIT;
 import static org.hibernate.cfg.JdbcSettings.CONNECTION_PROVIDER;
 import static org.hibernate.cfg.JdbcSettings.CONNECTION_PROVIDER_DISABLES_AUTOCOMMIT;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * @author Vlad Mihalcea
@@ -75,7 +76,7 @@ private void verifyConnections() {
 					Connection.class.getMethod( "setAutoCommit", boolean.class ),
 					connections.get( 0 )
 			);
-			assertTrue( "setAutoCommit should never be called", setAutoCommitCalls.isEmpty() );
+			assertTrue( setAutoCommitCalls.isEmpty(), "setAutoCommit should never be called" );
 		}
 		catch (NoSuchMethodException e) {
 			throw new RuntimeException( e );

hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DB2LegacySqlAstTranslator.java

@@ -118,7 +118,7 @@ protected void renderTableGroupJoin(TableGroupJoin tableGroupJoin, List<TableGro
 			}
 			appendSql( COMMA_SEPARATOR_CHAR );
 
-			renderJoinedTableGroup( tableGroupJoin.getJoinedGroup(), null, tableGroupJoinCollector );
+			renderJoinedTableGroup( tableGroupJoin, null, tableGroupJoinCollector );
 			if ( tableGroupJoin.getPredicate() != null && !tableGroupJoin.getPredicate().isEmpty() ) {
 				addAdditionalWherePredicate( tableGroupJoin.getPredicate() );
 			}

hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DerbyDialect.java

@@ -59,6 +59,7 @@
 import org.hibernate.query.sqm.mutation.spi.SqmMultiTableInsertStrategy;
 import org.hibernate.query.sqm.mutation.spi.SqmMultiTableMutationStrategy;
 import org.hibernate.service.ServiceRegistry;
+import org.hibernate.spi.NavigablePath;
 import org.hibernate.sql.ast.SqlAstNodeRenderingMode;
 import org.hibernate.sql.ast.SqlAstTranslator;
 import org.hibernate.sql.ast.SqlAstTranslatorFactory;
@@ -85,6 +86,7 @@
 import java.sql.SQLException;
 import java.sql.Types;
 import java.util.Locale;
+import java.util.Set;
 
 import static org.hibernate.type.SqlTypes.BINARY;
 import static org.hibernate.type.SqlTypes.BLOB;
@@ -564,8 +566,9 @@ public LockingSupport getLockingSupport() {
 	protected LockingClauseStrategy buildLockingClauseStrategy(
 			PessimisticLockKind lockKind,
 			RowLockStrategy rowLockStrategy,
-			LockOptions lockOptions) {
-		return new DerbyLockingClauseStrategy( this, lockKind, rowLockStrategy, lockOptions );
+			LockOptions lockOptions,
+			Set<NavigablePath> rootPathsForLocking) {
+		return new DerbyLockingClauseStrategy( this, lockKind, rowLockStrategy, lockOptions, rootPathsForLocking );
 	}
 
 	@Override

hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DerbyLegacyDialect.java

@@ -58,6 +58,7 @@
 import org.hibernate.query.sqm.mutation.spi.SqmMultiTableInsertStrategy;
 import org.hibernate.query.sqm.mutation.spi.SqmMultiTableMutationStrategy;
 import org.hibernate.service.ServiceRegistry;
+import org.hibernate.spi.NavigablePath;
 import org.hibernate.sql.ast.SqlAstNodeRenderingMode;
 import org.hibernate.sql.ast.SqlAstTranslator;
 import org.hibernate.sql.ast.SqlAstTranslatorFactory;
@@ -85,6 +86,7 @@
 import java.sql.DatabaseMetaData;
 import java.sql.SQLException;
 import java.sql.Types;
+import java.util.Set;
 
 import static org.hibernate.type.SqlTypes.BINARY;
 import static org.hibernate.type.SqlTypes.BLOB;
@@ -551,8 +553,9 @@ public boolean supportsCommentOn() {
 	protected LockingClauseStrategy buildLockingClauseStrategy(
 			PessimisticLockKind lockKind,
 			RowLockStrategy rowLockStrategy,
-			LockOptions lockOptions) {
-		return new DerbyLockingClauseStrategy( this, lockKind, rowLockStrategy, lockOptions );
+			LockOptions lockOptions,
+			Set<NavigablePath> rootPathsForLocking) {
+		return new DerbyLockingClauseStrategy( this, lockKind, rowLockStrategy, lockOptions, rootPathsForLocking );
 	}
 
 	@Override

hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DerbyLockingClauseStrategy.java

@@ -7,10 +7,13 @@
 import org.hibernate.LockOptions;
 import org.hibernate.dialect.Dialect;
 import org.hibernate.dialect.RowLockStrategy;
+import org.hibernate.spi.NavigablePath;
 import org.hibernate.sql.ast.internal.PessimisticLockKind;
 import org.hibernate.sql.ast.internal.StandardLockingClauseStrategy;
 import org.hibernate.sql.ast.spi.SqlAppender;
 
+import java.util.Set;
+
 /**
  * StandardLockingClauseStrategy subclass, specific for Derby.
  *
@@ -21,8 +24,9 @@ public DerbyLockingClauseStrategy(
 			Dialect dialect,
 			PessimisticLockKind lockKind,
 			RowLockStrategy rowLockStrategy,
-			LockOptions lockOptions) {
-		super( dialect, lockKind, rowLockStrategy, lockOptions );
+			LockOptions lockOptions,
+			Set<NavigablePath> rootPathsForLocking) {
+		super( dialect, lockKind, rowLockStrategy, lockOptions, rootPathsForLocking );
 	}
 
 	@Override

hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SQLServerLegacySqlAstTranslator.java

@@ -166,15 +166,15 @@ protected void renderTableGroupJoin(TableGroupJoin tableGroupJoin, List<TableGro
 				// We have to inject the lateral predicate into the sub-query
 				final Predicate lateralPredicate = this.lateralPredicate;
 				this.lateralPredicate = predicate;
-				renderJoinedTableGroup( tableGroupJoin.getJoinedGroup(), null, tableGroupJoinCollector );
+				renderJoinedTableGroup( tableGroupJoin, null, tableGroupJoinCollector );
 				this.lateralPredicate = lateralPredicate;
 			}
 			else {
-				renderJoinedTableGroup( tableGroupJoin.getJoinedGroup(), predicate, tableGroupJoinCollector );
+				renderJoinedTableGroup( tableGroupJoin, predicate, tableGroupJoinCollector );
 			}
 		}
 		else {
-			renderJoinedTableGroup( tableGroupJoin.getJoinedGroup(), null, tableGroupJoinCollector );
+			renderJoinedTableGroup( tableGroupJoin, null, tableGroupJoinCollector );
 		}
 	}