HHH-18953 correctly implement @save with generated id for reactive repos

and use xxxMultiple() for regular repos

Author: gavinking

tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/LifecycleMethod.java

@@ -112,65 +112,103 @@ private void returnArgument(StringBuilder declaration) {
 
 	private void delegateCall(StringBuilder declaration) {
 		if ( isReactive() ) {
+			// TODO: handle the case of an iterable parameter
+			delegateReactively( declaration );
+		}
+		else {
+			delegateBlockingly( declaration );
+		}
+	}
+
+	private void delegateBlockingly(StringBuilder declaration) {
+		if ( isGeneratedIdUpsert() ) {
 			declaration
-					.append("\treturn ")
-					.append(sessionName);
-			if ( isReactiveSessionAccess() ) {
-				declaration
-						.append(".chain(")
-						.append(localSessionName())
-						.append(" -> ")
-						.append(localSessionName());
-			}
-			declaration
+					.append("\t\tif (")
+					.append(sessionName)
+					.append(".getIdentifier(")
+					.append(parameterName)
+					.append(") == null)\n")
+					.append("\t\t\t")
+					.append(sessionName)
 					.append('.')
-					.append(operationName)
+					.append("insert")
 					.append('(')
-					.append(parameterName)
-					.append(')');
-			if ( isReactiveSessionAccess() ) {
-				declaration
-						.append(')');
-			}
-		}
-		else {
+					.append(parameterName);
 			if ( iterateParameter ) {
 				declaration
-						.append("\t\tfor (var _entity : ")
-						.append(parameterName)
-						.append(") {\n\t");
-			}
-			if ( "upsert".equals(operationName) && hasGeneratedId ) {
-				declaration
-						.append("\t\tif (")
-						.append(sessionName)
-						.append(".getIdentifier(")
-						.append(iterateParameter ? "_entity" : parameterName)
-						.append(") == null)\n")
-						.append("\t\t\t")
-						.append(sessionName)
-						.append('.')
-						.append("insert")
-						.append('(')
-						.append(iterateParameter ? "_entity" : parameterName)
-						.append(')')
-						.append(";\n")
-						.append("\t\telse\n\t");
+						.append("Multiple");
 			}
 			declaration
-					.append("\t\t")
+					.append(')')
+					.append(";\n")
+					.append("\t\telse\n\t");
+		}
+		declaration
+				.append("\t\t")
+				.append(sessionName)
+				.append('.')
+				.append(operationName);
+		if ( iterateParameter ) {
+			declaration
+					.append("Multiple");
+		}
+		declaration
+				.append('(')
+				.append(parameterName)
+				.append(')')
+				.append(";\n");
+	}
+
+	private void delegateReactively(StringBuilder declaration) {
+		declaration
+				.append("\treturn ");
+		if ( isReactiveSessionAccess() ) {
+			declaration
 					.append(sessionName)
+					.append(".chain(")
+					.append(localSessionName())
+					.append(" -> ");
+		}
+		if ( isGeneratedIdUpsert() ) {
+			declaration
+					.append("\t\t(")
+					.append(localSessionName())
+					.append(".getIdentifier(")
+					.append(parameterName)
+					.append(") == null ? ")
+					.append(localSessionName())
 					.append('.')
-					.append(operationName)
+					.append("insert")
 					.append('(')
-					.append(iterateParameter ? "_entity" : parameterName)
+					.append(parameterName)
 					.append(')')
-					.append(";\n");
-			if ( iterateParameter ) {
-				declaration
-						.append("\t\t}\n");
-			}
+					.append(" : ");
 		}
+		declaration
+				.append(localSessionName())
+				.append( '.' )
+				.append( operationName );
+		if ( iterateParameter) {
+			// note that there is no upsertAll() method
+			declaration
+					.append( "All" );
+		}
+		declaration
+				.append( '(' )
+				.append( parameterName )
+				.append( ')' );
+		if ( isGeneratedIdUpsert() ) {
+			declaration
+					.append(')');
+		}
+		if ( isReactiveSessionAccess() ) {
+			declaration
+					.append(')');
+		}
+	}
+
+	private boolean isGeneratedIdUpsert() {
+		return "upsert".equals( operationName ) && hasGeneratedId;
 	}
 
 	private void preamble(StringBuilder declaration) {