Revert "HHH-19314 StackOverflowException when using onConflict with createCriteriaInsertValues and createCriteriaInsertSelect"

This reverts commit 0d2d2a8.

Author: beikov

hibernate-core/src/main/java/org/hibernate/query/sqm/tree/insert/AbstractSqmInsertStatement.java

@@ -89,10 +89,6 @@ protected List<SqmPath<?>> copyInsertionTargetPaths(SqmCopyContext context) {
 		}
 	}
 
-	void setConflictClause(SqmConflictClause<T> conflictClause) {
-		this.conflictClause = conflictClause;
-	}
-
 	protected void verifyInsertTypesMatch(
 			List<SqmPath<?>> insertionTargetPaths,
 			List<? extends SqmTypedNode<?>> expressions) {

hibernate-core/src/main/java/org/hibernate/query/sqm/tree/insert/SqmConflictClause.java

@@ -54,7 +54,7 @@ private SqmConflictClause(
 		this.insertStatement = insertStatement;
 		this.excludedRoot = excludedRoot;
 		this.constraintName = constraintName;
-		this.constraintPaths = constraintPaths == null ? null : Collections.unmodifiableList( constraintPaths );
+		this.constraintPaths = Collections.unmodifiableList( constraintPaths );
 		this.updateAction = updateAction;
 	}
 
@@ -157,7 +157,7 @@ public SqmConflictClause<T> copy(SqmCopyContext context) {
 						insertStatement.copy( context ),
 						excludedRoot.copy( context ),
 						constraintName,
-						constraintPaths == null ? null : copyOf( constraintPaths, context ),
+						copyOf( constraintPaths, context ),
 						updateAction == null ? null : updateAction.copy( context )
 				)
 		);

hibernate-core/src/main/java/org/hibernate/query/sqm/tree/insert/SqmInsertSelectStatement.java

@@ -77,26 +77,19 @@ public SqmInsertSelectStatement<T> copy(SqmCopyContext context) {
 		if ( existing != null ) {
 			return existing;
 		}
-		final SqmInsertSelectStatement<T> sqmInsertSelectStatementCopy = new SqmInsertSelectStatement<>(
-				nodeBuilder(),
-				context.getQuerySource() == null ? getQuerySource() : context.getQuerySource(),
-				copyParameters( context ),
-				copyCteStatements( context ),
-				getTarget().copy( context ),
-				null,
-				null,
-				selectQueryPart.copy( context )
+		return context.registerCopy(
+				this,
+				new SqmInsertSelectStatement<>(
+						nodeBuilder(),
+						context.getQuerySource() == null ? getQuerySource() : context.getQuerySource(),
+						copyParameters( context ),
+						copyCteStatements( context ),
+						getTarget().copy( context ),
+						copyInsertionTargetPaths( context ),
+						getConflictClause() == null ? null : getConflictClause().copy( context ),
+						selectQueryPart.copy( context )
+				)
 		);
-
-		context.registerCopy( this, sqmInsertSelectStatementCopy );
-
-		sqmInsertSelectStatementCopy.setInsertionTargetPaths( copyInsertionTargetPaths( context ) );
-
-		if ( getConflictClause() != null ) {
-			sqmInsertSelectStatementCopy.setConflictClause( getConflictClause().copy( context ) );
-		}
-
-		return sqmInsertSelectStatementCopy;
 	}
 
 	@Override

hibernate-core/src/main/java/org/hibernate/query/sqm/tree/insert/SqmInsertValuesStatement.java

@@ -82,8 +82,7 @@ public SqmInsertValuesStatement<T> copy(SqmCopyContext context) {
 				valuesList.add( sqmValues.copy( context ) );
 			}
 		}
-
-		final SqmInsertValuesStatement<T> sqmInsertValuesStatementCopy = context.registerCopy(
+		return context.registerCopy(
 				this,
 				new SqmInsertValuesStatement<>(
 						nodeBuilder(),
@@ -92,16 +91,10 @@ public SqmInsertValuesStatement<T> copy(SqmCopyContext context) {
 						copyCteStatements( context ),
 						getTarget().copy( context ),
 						copyInsertionTargetPaths( context ),
-						null,
+						getConflictClause() == null ? null : getConflictClause().copy( context ),
 						valuesList
 				)
 		);
-
-		if ( getConflictClause() != null ) {
-			sqmInsertValuesStatementCopy.setConflictClause( getConflictClause().copy( context ) );
-		}
-
-		return sqmInsertValuesStatementCopy;
 	}
 
 	public SqmInsertValuesStatement<T> copyWithoutValues(SqmCopyContext context) {