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/AnnotationMetaEntity.java

@@ -1384,7 +1384,7 @@ else if ( returnArgument
 								sessionType,
 								operation,
 								context.addNonnullAnnotation(),
-								isIterableLifecycleParameter(parameterType),
+								lifecycleParameterKind(parameterType),
 								returnArgument,
 								hasGeneratedId(declaredType)
 						)
@@ -1405,16 +1405,18 @@ && hasAnnotation(member, ID) ) {
 		return false;
 	}
 
-	private static boolean isIterableLifecycleParameter(TypeMirror parameterType) {
+	private static LifecycleMethod.ParameterKind lifecycleParameterKind(TypeMirror parameterType) {
 		switch (parameterType.getKind()) {
 			case ARRAY:
-				return true;
+				return LifecycleMethod.ParameterKind.ARRAY;
 			case DECLARED:
 				final DeclaredType declaredType = (DeclaredType) parameterType;
 				final TypeElement typeElement = (TypeElement) declaredType.asElement();
-				return typeElement.getQualifiedName().contentEquals(LIST);
+				return typeElement.getQualifiedName().contentEquals(LIST)
+						? LifecycleMethod.ParameterKind.LIST
+						: LifecycleMethod.ParameterKind.NORMAL;
 			default:
-				return false;
+				return LifecycleMethod.ParameterKind.NORMAL;
 		}
 	}
 

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

@@ -4,8 +4,10 @@
  */
 package org.hibernate.processor.annotation;
 
+
 import javax.lang.model.element.ExecutableElement;
 
+import static org.hibernate.processor.util.Constants.LIST;
 import static org.hibernate.processor.util.Constants.UNI;
 
 public class LifecycleMethod extends AbstractAnnotatedMethod {
@@ -14,10 +16,16 @@ public class LifecycleMethod extends AbstractAnnotatedMethod {
 	private final String parameterName;
 	private final String operationName;
 	private final boolean addNonnullAnnotation;
-	private final boolean iterateParameter;
+	private final ParameterKind parameterKind;
 	private final boolean returnArgument;
 	private final boolean hasGeneratedId;
 
+	public enum ParameterKind {
+		NORMAL,
+		ARRAY,
+		LIST
+	}
+
 	public LifecycleMethod(
 			AnnotationMetaEntity annotationMetaEntity,
 			ExecutableElement method,
@@ -28,7 +36,7 @@ public LifecycleMethod(
 			String sessionType,
 			String operationName,
 			boolean addNonnullAnnotation,
-			boolean iterateParameter,
+			ParameterKind parameterKind,
 			boolean returnArgument,
 			boolean hasGeneratedId) {
 		super(annotationMetaEntity, method, sessionName, sessionType);
@@ -37,7 +45,7 @@ public LifecycleMethod(
 		this.parameterName = parameterName;
 		this.operationName = operationName;
 		this.addNonnullAnnotation = addNonnullAnnotation;
-		this.iterateParameter = iterateParameter;
+		this.parameterKind = parameterKind;
 		this.returnArgument = returnArgument;
 		this.hasGeneratedId = hasGeneratedId;
 	}
@@ -98,9 +106,10 @@ private void returnArgument(StringBuilder declaration) {
 		if ( returnArgument ) {
 			if ( isReactive() ) {
 				declaration
-					.append(".replaceWith(")
-					.append(parameterName)
-					.append(")");
+						.append( "\n\t\t\t" )
+						.append(".replaceWith(")
+						.append(parameterName)
+						.append(")");
 			}
 			else {
 				declaration
@@ -112,65 +121,110 @@ 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('.')
-					.append(operationName)
-					.append('(')
+					.append("\t\tif (")
+					.append(sessionName)
+					.append(".getIdentifier(")
 					.append(parameterName)
-					.append(')');
-			if ( isReactiveSessionAccess() ) {
-				declaration
-						.append(')');
-			}
+					.append(") == null)\n")
+					.append("\t\t\t")
+					.append(sessionName)
+					.append('.')
+					.append("insert");
+			argument( declaration, "Multiple" );
+			declaration
+					.append(";\n")
+					.append("\t\telse\n\t");
 		}
-		else {
-			if ( iterateParameter ) {
+		declaration
+				.append("\t\t")
+				.append(sessionName)
+				.append('.')
+				.append(operationName);
+		argument( declaration, "Multiple" );
+		declaration
+				.append(";\n");
+	}
+
+	private void argument(StringBuilder declaration, String suffix) {
+		switch ( parameterKind ) {
+			case LIST:
 				declaration
-						.append("\t\tfor (var _entity : ")
+						.append(suffix)
+						.append("(")
 						.append(parameterName)
-						.append(") {\n\t");
-			}
-			if ( "upsert".equals(operationName) && hasGeneratedId ) {
+						.append(")");
+				break;
+			case ARRAY:
+				declaration
+						.append(suffix)
+						.append("(")
+						.append(annotationMetaEntity.importType(LIST))
+						.append(".of(")
+						.append(parameterName)
+						.append("))");
+				break;
+			default:
 				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(parameterName)
+						.append(')');
+		}
+	}
+
+	private void delegateReactively(StringBuilder declaration) {
+		declaration
+				.append("\treturn ");
+		if ( isReactiveSessionAccess() ) {
 			declaration
-					.append("\t\t")
 					.append(sessionName)
+					.append(".chain(")
+					.append(localSessionName())
+					.append(" -> ");
+		}
+		if ( isGeneratedIdUpsert() ) {
+			declaration
+					.append("(")
+					.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 );
+		// note that there is no upsertAll() method
+		argument( declaration, "All" );
+		if ( isGeneratedIdUpsert() ) {
+			declaration
+					.append(')');
+		}
+		if ( isReactiveSessionAccess() ) {
+			declaration
+					.append(')');
+		}
+	}
+
+	private boolean isGeneratedIdUpsert() {
+		return "upsert".equals( operationName ) && hasGeneratedId;
 	}
 
 	private void preamble(StringBuilder declaration) {