Optional sort in REST Data Panache

quarkusio · May 17, 2021 · 5b516a3 · 5b516a3
1 parent c33d746
commit 5b516a3
Show file tree

Hide file tree

Showing 8 changed files with 78 additions and 2 deletions.
diff --git a/...ain/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/DataAccessImplementor.java b/...ain/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/DataAccessImplementor.java
@@ -17,6 +17,15 @@ public interface DataAccessImplementor {
      */
     ResultHandle findById(BytecodeCreator creator, ResultHandle id);
 
+    /**
+     * Find all entities.
+     *
+     * @param creator Bytecode creator that should be used for implementation.
+     * @param page Page instance that should be used in a query. Might be null if pagination is disabled.
+     * @return Entity list
+     */
+    ResultHandle findAll(BytecodeCreator creator, ResultHandle page);
+
     /**
      * Find all entities.
      *

diff --git a/...va/io/quarkus/hibernate/orm/rest/data/panache/deployment/EntityDataAccessImplementor.java b/...va/io/quarkus/hibernate/orm/rest/data/panache/deployment/EntityDataAccessImplementor.java
@@ -33,6 +33,17 @@ public ResultHandle findById(BytecodeCreator creator, ResultHandle id) {
                 id);
     }
 
+    /**
+     * Implements <code>Entity.findAll().page(page).list()</code>
+     */
+    @Override
+    public ResultHandle findAll(BytecodeCreator creator, ResultHandle page) {
+        ResultHandle query = creator.invokeStaticMethod(ofMethod(entityClassName, "findAll", PanacheQuery.class));
+        creator.invokeInterfaceMethod(ofMethod(PanacheQuery.class, "page", PanacheQuery.class, Page.class), query,
+                page);
+        return creator.invokeInterfaceMethod(ofMethod(PanacheQuery.class, "list", List.class), query);
+    }
+
     /**
      * Implements <code>Entity.findAll(sort).page(page).list()</code>
      */

diff --git a/...o/quarkus/hibernate/orm/rest/data/panache/deployment/RepositoryDataAccessImplementor.java b/...o/quarkus/hibernate/orm/rest/data/panache/deployment/RepositoryDataAccessImplementor.java
@@ -38,6 +38,17 @@ public ResultHandle findById(BytecodeCreator creator, ResultHandle id) {
                 getRepositoryInstance(creator), id);
     }
 
+    /**
+     * Implements <code>repository.findAll().page(page).list()</code>
+     */
+    @Override
+    public ResultHandle findAll(BytecodeCreator creator, ResultHandle page) {
+        ResultHandle query = creator.invokeInterfaceMethod(
+                ofMethod(PanacheRepositoryBase.class, "findAll", PanacheQuery.class), getRepositoryInstance(creator));
+        creator.invokeInterfaceMethod(ofMethod(PanacheQuery.class, "page", PanacheQuery.class, Page.class), query, page);
+        return creator.invokeInterfaceMethod(ofMethod(PanacheQuery.class, "list", List.class), query);
+    }
+
     /**
      * Implements <code>repository.findAll(sort).page(page).list()</code>
      */

diff --git a/.../main/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/ResourceImplementor.java b/.../main/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/ResourceImplementor.java
@@ -1,5 +1,7 @@
 package io.quarkus.hibernate.orm.rest.data.panache.deployment;
 
+import static io.quarkus.gizmo.MethodDescriptor.ofMethod;
+
 import java.util.List;
 
 import javax.enterprise.context.ApplicationScoped;
@@ -8,6 +10,7 @@
 import org.jboss.jandex.FieldInfo;
 import org.jboss.logging.Logger;
 
+import io.quarkus.gizmo.BranchResult;
 import io.quarkus.gizmo.BytecodeCreator;
 import io.quarkus.gizmo.ClassCreator;
 import io.quarkus.gizmo.ClassOutput;
@@ -65,7 +68,13 @@ private void implementList(ClassCreator classCreator, DataAccessImplementor data
         MethodCreator methodCreator = classCreator.getMethodCreator("list", List.class, Page.class, Sort.class);
         ResultHandle page = methodCreator.getMethodParam(0);
         ResultHandle sort = methodCreator.getMethodParam(1);
-        methodCreator.returnValue(dataAccessImplementor.findAll(methodCreator, page, sort));
+        ResultHandle columns = methodCreator.invokeVirtualMethod(ofMethod(Sort.class, "getColumns", List.class), sort);
+        ResultHandle isEmptySort = methodCreator.invokeInterfaceMethod(ofMethod(List.class, "isEmpty", boolean.class), columns);
+
+        BranchResult isEmptySortBranch = methodCreator.ifTrue(isEmptySort);
+        isEmptySortBranch.trueBranch().returnValue(dataAccessImplementor.findAll(isEmptySortBranch.trueBranch(), page));
+        isEmptySortBranch.falseBranch().returnValue(dataAccessImplementor.findAll(isEmptySortBranch.falseBranch(), page, sort));
+
         methodCreator.close();
     }
 

diff --git a/.../src/main/java/io/quarkus/mongodb/rest/data/panache/deployment/DataAccessImplementor.java b/.../src/main/java/io/quarkus/mongodb/rest/data/panache/deployment/DataAccessImplementor.java
@@ -17,6 +17,15 @@ public interface DataAccessImplementor {
      */
     ResultHandle findById(BytecodeCreator creator, ResultHandle id);
 
+    /**
+     * Find all entities.
+     *
+     * @param creator Bytecode creator that should be used for implementation.
+     * @param page Page instance that should be used in a query. Might be null if pagination is disabled.
+     * @return Entity list
+     */
+    ResultHandle findAll(BytecodeCreator creator, ResultHandle page);
+
     /**
      * Find all entities.
      *

diff --git a/...ain/java/io/quarkus/mongodb/rest/data/panache/deployment/EntityDataAccessImplementor.java b/...ain/java/io/quarkus/mongodb/rest/data/panache/deployment/EntityDataAccessImplementor.java
@@ -25,6 +25,14 @@ public ResultHandle findById(BytecodeCreator creator, ResultHandle id) {
                 ofMethod(entityClassName, "findById", PanacheMongoEntityBase.class, Object.class), id);
     }
 
+    @Override
+    public ResultHandle findAll(BytecodeCreator creator, ResultHandle page) {
+        ResultHandle query = creator.invokeStaticMethod(ofMethod(entityClassName, "findAll", PanacheQuery.class));
+        creator.invokeInterfaceMethod(ofMethod(PanacheQuery.class, "page", PanacheQuery.class, Page.class), query,
+                page);
+        return creator.invokeInterfaceMethod(ofMethod(PanacheQuery.class, "list", List.class), query);
+    }
+
     @Override
     public ResultHandle findAll(BytecodeCreator creator, ResultHandle page, ResultHandle sort) {
         ResultHandle query = creator.invokeStaticMethod(

diff --git a/...java/io/quarkus/mongodb/rest/data/panache/deployment/RepositoryDataAccessImplementor.java b/...java/io/quarkus/mongodb/rest/data/panache/deployment/RepositoryDataAccessImplementor.java
@@ -30,6 +30,16 @@ public ResultHandle findById(BytecodeCreator creator, ResultHandle id) {
                 getRepositoryInstance(creator), id);
     }
 
+    @Override
+    public ResultHandle findAll(BytecodeCreator creator, ResultHandle page) {
+        ResultHandle query = creator.invokeInterfaceMethod(
+                ofMethod(PanacheMongoRepositoryBase.class, "findAll", PanacheQuery.class),
+                getRepositoryInstance(creator));
+        creator.invokeInterfaceMethod(ofMethod(PanacheQuery.class, "page", PanacheQuery.class, Page.class), query,
+                page);
+        return creator.invokeInterfaceMethod(ofMethod(PanacheQuery.class, "list", List.class), query);
+    }
+
     @Override
     public ResultHandle findAll(BytecodeCreator creator, ResultHandle page, ResultHandle sort) {
         ResultHandle query = creator.invokeInterfaceMethod(

diff --git a/...nt/src/main/java/io/quarkus/mongodb/rest/data/panache/deployment/ResourceImplementor.java b/...nt/src/main/java/io/quarkus/mongodb/rest/data/panache/deployment/ResourceImplementor.java
@@ -1,12 +1,15 @@
 package io.quarkus.mongodb.rest.data.panache.deployment;
 
+import static io.quarkus.gizmo.MethodDescriptor.ofMethod;
+
 import java.util.List;
 
 import javax.enterprise.context.ApplicationScoped;
 
 import org.jboss.jandex.FieldInfo;
 import org.jboss.logging.Logger;
 
+import io.quarkus.gizmo.BranchResult;
 import io.quarkus.gizmo.BytecodeCreator;
 import io.quarkus.gizmo.ClassCreator;
 import io.quarkus.gizmo.ClassOutput;
@@ -60,7 +63,13 @@ private void implementList(ClassCreator classCreator, DataAccessImplementor data
         MethodCreator methodCreator = classCreator.getMethodCreator("list", List.class, Page.class, Sort.class);
         ResultHandle page = methodCreator.getMethodParam(0);
         ResultHandle sort = methodCreator.getMethodParam(1);
-        methodCreator.returnValue(dataAccessImplementor.findAll(methodCreator, page, sort));
+        ResultHandle columns = methodCreator.invokeVirtualMethod(ofMethod(Sort.class, "getColumns", List.class), sort);
+        ResultHandle isEmptySort = methodCreator.invokeInterfaceMethod(ofMethod(List.class, "isEmpty", boolean.class), columns);
+
+        BranchResult isEmptySortBranch = methodCreator.ifTrue(isEmptySort);
+        isEmptySortBranch.trueBranch().returnValue(dataAccessImplementor.findAll(isEmptySortBranch.trueBranch(), page));
+        isEmptySortBranch.falseBranch().returnValue(dataAccessImplementor.findAll(isEmptySortBranch.falseBranch(), page, sort));
+
         methodCreator.close();
     }