2 files changed, 16 insertions, 4 deletions
diff --git a/src/main/java/io/trygvis/esper/testing/web/JerseyApplication.java b/src/main/java/io/trygvis/esper/testing/web/JerseyApplication.java
index 3c86581..38cfd9d 100755
--- a/src/main/java/io/trygvis/esper/testing/web/JerseyApplication.java
+++ b/src/main/java/io/trygvis/esper/testing/web/JerseyApplication.java
@@ -15,7 +15,12 @@ import javax.ws.rs.core.*;
 import javax.ws.rs.ext.*;
 import java.lang.reflect.*;
 import java.util.*;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
+import static fj.data.List.iterableList;
+import static fj.data.List.nil;
 import static fj.data.Option.*;
 import static io.trygvis.esper.testing.Util.parseInt;
 
@@ -59,9 +64,18 @@ public class JerseyApplication extends Application {
                     public Object getValue(HttpContext hc) {
                         MultivaluedMap<String, String> queryParameters = hc.getRequest().getQueryParameters();
 
+                        List<String> list = queryParameters.get("orderBy");
+
+                        fj.data.List<String> orderBy = nil();
+
+                        if (list != null) {
+                            orderBy = iterableList(list);
+                        }
+
                         return new PageRequest(
                                 fromNull(queryParameters.getFirst("startIndex")).bind(parseInt),
-                                fromNull(queryParameters.getFirst("count")).bind(parseInt));
+                                fromNull(queryParameters.getFirst("count")).bind(parseInt),
+                                orderBy);
                     }
                 };
             } else if (UUID.class.equals(type)) {
diff --git a/src/main/java/io/trygvis/esper/testing/web/resource/CoreResource.java b/src/main/java/io/trygvis/esper/testing/web/resource/CoreResource.java
index c58bc13..4ab95c6 100755
--- a/src/main/java/io/trygvis/esper/testing/web/resource/CoreResource.java
+++ b/src/main/java/io/trygvis/esper/testing/web/resource/CoreResource.java
@@ -35,9 +35,7 @@ public class CoreResource extends AbstractResource {
 
     @GET
     @Path("/person")
-    public List<PersonDetailJson> getPersons(@Context final HttpServletRequest req) throws Exception {
-        final PageRequest pageRequest = pageReq(req);
-
+    public List<PersonDetailJson> getPersons(@MagicParam final PageRequest pageRequest) throws Exception {
         return da.inTransaction(new CoreDaosCallback<List<PersonDetailJson>>() {
             protected List<PersonDetailJson> run() throws SQLException {
                 List<PersonDetailJson> list = new ArrayList<>();