Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-17772 misc improvements to impl of Sort parameters

This commit is contained in:
Gavin King 2024-02-24 01:21:32 +01:00
parent 2281805e91
commit 862a967a17
2 changed files with 19 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/annotation/AbstractQueryMethod.java
View File

@ -222,14 +222,14 @@ public abstract class AbstractQueryMethod implements MetaAttribute {
.append(annotationMetaEntity.importType(ArrayList.class.getName()))
.append("<>() {{\n\t\t\t\t")
.append(paramName)
.append(".forEach(sort -> add(")
.append(".forEach(_sort -> add(")
.append("by(")
.append(annotationMetaEntity.importType(sortableEntityClass))
.append(".class, ")
.append("sort.property()")
.append("_sort.property()")
.append(",\n\t\t\t\t\t\t")
.append("sort.isAscending() ? ASCENDING : DESCENDING")
.append(", sort.ignoreCase())));\n\t\t\t}})");
.append("_sort.isAscending() ? ASCENDING : DESCENDING, ")
.append("_sort.ignoreCase())));\n\t\t\t}})");
}
}
else if ( paramType.startsWith(JD_SORT) && paramType.endsWith("...") ) {
@ -243,14 +243,14 @@ public abstract class AbstractQueryMethod implements MetaAttribute {
declaration
.append("\n\t\t\t.setOrder(asList(")
.append(paramName)
.append(").stream().map(sort -> ")
.append(").stream().map(_sort -> ")
.append("by(")
.append(annotationMetaEntity.importType(sortableEntityClass))
.append(".class, ")
.append("sort.property()")
.append("_sort.property()")
.append(",\n\t\t\t\t\t\t")
.append("sort.isAscending() ? ASCENDING : DESCENDING")
.append(", sort.ignoreCase()))\n\t\t\t\t.collect(toList())\n\t\t\t)");
.append("_sort.isAscending() ? ASCENDING : DESCENDING, ")
.append("_sort.ignoreCase()))\n\t\t\t\t.collect(toList())\n\t\t\t)");
}
}
else if ( paramType.startsWith(JD_SORT) ) {

25
tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/annotation/CriteriaFinderMethod.java
View File

@ -8,6 +8,7 @@ package org.hibernate.jpamodelgen.annotation;
import org.checkerframework.checker.nullness.qual.Nullable;
import org.hibernate.jpamodelgen.util.Constants;
import org.hibernate.query.NullPrecedence;
import java.util.Arrays;
import java.util.List;
@ -258,32 +259,28 @@ public class CriteriaFinderMethod extends AbstractFinderMethod {
.append(')');
}
private static final String ORDER_CONVERSION =
"builder.sort(entity.get(_sort.property())," +
"\n\t\t\t\t\t_sort.isAscending() ? ASCENDING : DESCENDING," +
"\n\t\t\t\t\tNONE, _sort.ignoreCase())";
private void orderBy(StringBuilder declaration, String paramName, boolean variadic) {
// TODO: Sort.ignoreCase()
if ( variadic ) {
annotationMetaEntity.staticImport(Arrays.class.getName(), "asList");
annotationMetaEntity.staticImport(Collectors.class.getName(), "toList");
annotationMetaEntity.staticImport(NullPrecedence.class.getName(), "NONE");
declaration
.append("\n\t\tasList(")
.append(paramName)
.append(")\n\t\t\t.stream()\n\t\t\t.map(sort -> sort.isAscending()\n")
.append("\t\t\t\t\t? builder.asc(entity.get(sort.property()))\n")
.append("\t\t\t\t\t: builder.desc(entity.get(sort.property()))\n")
.append("\t\t\t)\n\t\t\t.collect(toList())");
.append(")\n\t\t\t.stream()\n\t\t\t.map(_sort -> ")
.append(ORDER_CONVERSION)
.append("\n\t\t\t)\n\t\t\t.collect(toList())");
}
else {
declaration
.append("\n\t\t")
.append(paramName)
.append(".isAscending()\n")
.append("\t\t\t\t? builder.")
.append("asc(entity.get(")
.append(paramName)
.append(".property()))\n")
.append("\t\t\t\t: builder.")
.append("desc(entity.get(")
.append(paramName)
.append(".property()))");
.append(ORDER_CONVERSION.replace("_sort", paramName));
}
}