HHH-18818 Cleanup code, test code and add some more javadoc

Author: beikov

hibernate-core/src/main/java/org/hibernate/id/enhanced/Optimizer.java

@@ -69,8 +69,10 @@ public interface Optimizer {
 	 * strategy for calculating the starting value of a sequence range.
 	 *
 	 * @param databaseValue The expression representing the next value from database sequence
-	 * @param sessionFactory
+	 * @param sessionFactory The session factory
 	 * @return An expression that calculates the low/base value according to the optimizer strategy
+	 *
+	 * @since 7.1
 	 */
 	Expression createLowValueExpression(Expression databaseValue, SessionFactoryImplementor sessionFactory);
 }

hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/cte/CteInsertHandler.java

@@ -388,11 +388,12 @@ public int execute(DomainQueryExecutionContext executionContext) {
 								sessionFactory.getSqlStringGenerationContext()
 						);
 
-				Expression databaseValue = new SelfRenderingSqlFragmentExpression( fragment );
-				rowsWithSequenceQuery.getSelectClause().addSqlSelection(
-						new SqlSelectionImpl( 1,
-								optimizer.createLowValueExpression( databaseValue, sessionFactory ) )
+				final Expression lowValueExpression = optimizer.createLowValueExpression(
+						new SelfRenderingSqlFragmentExpression( fragment ),
+						sessionFactory
 				);
+				rowsWithSequenceQuery.getSelectClause()
+						.addSqlSelection( new SqlSelectionImpl( 1, lowValueExpression ) );
 
 				rowsWithSequenceQuery.applyPredicate(
 						new ComparisonPredicate(

hibernate-core/src/test/java/org/hibernate/orm/test/id/cte/CteInsertWithHiLoOptimizerTest.java

@@ -1,17 +1,15 @@
 /*
- * SPDX-License-Identifier: LGPL-2.1-or-later
+ * SPDX-License-Identifier: Apache-2.0
  * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.id.cte;
 
 import org.hibernate.cfg.AvailableSettings;
-import org.hibernate.dialect.DB2Dialect;
-import org.hibernate.dialect.PostgreSQLDialect;
 import org.hibernate.id.enhanced.HiLoOptimizer;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.JiraKey;
-import org.hibernate.testing.orm.junit.RequiresDialect;
-import org.hibernate.testing.orm.junit.RequiresDialects;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.testing.orm.junit.ServiceRegistry;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
@@ -28,12 +26,9 @@
  */
 @JiraKey("HHH-18818")
 @SessionFactory
-@RequiresDialects({
-		@RequiresDialect(PostgreSQLDialect.class),
-		@RequiresDialect(DB2Dialect.class)
-})
 @ServiceRegistry(settings = @Setting(name = AvailableSettings.PREFERRED_POOLED_OPTIMIZER, value = "hilo"))
 @DomainModel(annotatedClasses = Dummy.class)
+@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsCteInsertStrategy.class)
 public class CteInsertWithHiLoOptimizerTest {
 	@Test
 	void test(SessionFactoryScope scope) {

hibernate-core/src/test/java/org/hibernate/orm/test/id/cte/CteInsertWithLegacyHiLoOptimizerTest.java

@@ -1,17 +1,15 @@
 /*
- * SPDX-License-Identifier: LGPL-2.1-or-later
+ * SPDX-License-Identifier: Apache-2.0
  * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.id.cte;
 
 import org.hibernate.cfg.AvailableSettings;
-import org.hibernate.dialect.DB2Dialect;
-import org.hibernate.dialect.PostgreSQLDialect;
 import org.hibernate.id.enhanced.LegacyHiLoAlgorithmOptimizer;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.JiraKey;
-import org.hibernate.testing.orm.junit.RequiresDialect;
-import org.hibernate.testing.orm.junit.RequiresDialects;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.testing.orm.junit.ServiceRegistry;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
@@ -28,12 +26,9 @@
  */
 @JiraKey("HHH-18818")
 @SessionFactory
-@RequiresDialects({
-		@RequiresDialect(PostgreSQLDialect.class),
-		@RequiresDialect(DB2Dialect.class)
-})
 @ServiceRegistry(settings = @Setting(name = AvailableSettings.PREFERRED_POOLED_OPTIMIZER, value = "legacy-hilo"))
 @DomainModel(annotatedClasses = Dummy.class)
+@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsCteInsertStrategy.class)
 public class CteInsertWithLegacyHiLoOptimizerTest {
 	@Test
 	void test(SessionFactoryScope scope) {

hibernate-core/src/test/java/org/hibernate/orm/test/id/cte/CteInsertWithNoopOptimizerTest.java

@@ -1,13 +1,15 @@
 /*
- * SPDX-License-Identifier: LGPL-2.1-or-later
+ * SPDX-License-Identifier: Apache-2.0
  * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.id.cte;
 
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.id.enhanced.NoopOptimizer;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.JiraKey;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.testing.orm.junit.ServiceRegistry;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
@@ -26,6 +28,7 @@
 @SessionFactory
 @ServiceRegistry(settings = @Setting(name = AvailableSettings.PREFERRED_POOLED_OPTIMIZER, value = "none"))
 @DomainModel(annotatedClasses = Dummy.class)
+@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsCteInsertStrategy.class)
 public class CteInsertWithNoopOptimizerTest {
 	@Test
 	void test(SessionFactoryScope scope) {

hibernate-core/src/test/java/org/hibernate/orm/test/id/cte/CteInsertWithPooledLoOptimizerTest.java

@@ -1,13 +1,15 @@
 /*
- * SPDX-License-Identifier: LGPL-2.1-or-later
+ * SPDX-License-Identifier: Apache-2.0
  * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.id.cte;
 
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.id.enhanced.PooledLoOptimizer;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.JiraKey;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.testing.orm.junit.ServiceRegistry;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
@@ -26,6 +28,7 @@
 @SessionFactory
 @ServiceRegistry(settings = @Setting(name = AvailableSettings.PREFERRED_POOLED_OPTIMIZER, value = "pooled-lo"))
 @DomainModel(annotatedClasses = Dummy.class)
+@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsCteInsertStrategy.class)
 public class CteInsertWithPooledLoOptimizerTest {
 	@Test
 	void test(SessionFactoryScope scope) {

hibernate-core/src/test/java/org/hibernate/orm/test/id/cte/CteInsertWithPooledLoThreadLocalOptimizerTest.java

@@ -1,13 +1,15 @@
 /*
- * SPDX-License-Identifier: LGPL-2.1-or-later
+ * SPDX-License-Identifier: Apache-2.0
  * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.id.cte;
 
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.id.enhanced.PooledLoThreadLocalOptimizer;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.JiraKey;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.testing.orm.junit.ServiceRegistry;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
@@ -24,6 +26,7 @@
 @SessionFactory
 @ServiceRegistry(settings = @Setting(name = AvailableSettings.PREFERRED_POOLED_OPTIMIZER, value = "pooled-lotl"))
 @DomainModel(annotatedClasses = Dummy.class)
+@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsCteInsertStrategy.class)
 public class CteInsertWithPooledLoThreadLocalOptimizerTest {
 	@Test
 	void test(SessionFactoryScope scope) {

hibernate-core/src/test/java/org/hibernate/orm/test/id/cte/CteInsertWithPooledOptimizerTest.java

@@ -1,13 +1,15 @@
 /*
- * SPDX-License-Identifier: LGPL-2.1-or-later
+ * SPDX-License-Identifier: Apache-2.0
  * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.id.cte;
 
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.id.enhanced.PooledOptimizer;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.JiraKey;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.testing.orm.junit.ServiceRegistry;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
@@ -26,6 +28,7 @@
 @SessionFactory
 @ServiceRegistry(settings = @Setting(name = AvailableSettings.PREFERRED_POOLED_OPTIMIZER, value = "pooled"))
 @DomainModel(annotatedClasses = Dummy.class)
+@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsCteInsertStrategy.class)
 public class CteInsertWithPooledOptimizerTest {
 	@Test
 	void test(SessionFactoryScope scope) {

hibernate-core/src/test/java/org/hibernate/orm/test/id/cte/Dummy.java

@@ -1,5 +1,5 @@
 /*
- * SPDX-License-Identifier: LGPL-2.1-or-later
+ * SPDX-License-Identifier: Apache-2.0
  * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.id.cte;

hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/DialectFeatureChecks.java

@@ -449,6 +449,15 @@ public boolean apply(Dialect dialect) {
 		}
 	}
 
+	public static class SupportsCteInsertStrategy implements DialectFeatureCheck {
+		public boolean apply(Dialect dialect) {
+			return dialect instanceof PostgreSQLDialect
+				|| dialect instanceof CockroachDialect
+				|| dialect instanceof DB2Dialect
+				|| dialect instanceof GaussDBDialect;
+		}
+	}
+
 	public static class SupportsTemporaryTable implements DialectFeatureCheck {
 		public boolean apply(Dialect dialect) {
 			return dialect.getLocalTemporaryTableStrategy() != null || dialect.getGlobalTemporaryTableStrategy() != null;