Fixed build

yahoo · Feb 3, 2020 · 2cee0d4 · 2cee0d4
1 parent 2d4041b
commit 2cee0d4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/elide-core/src/main/java/com/yahoo/elide/core/pagination/PaginationImpl.java b/elide-core/src/main/java/com/yahoo/elide/core/pagination/PaginationImpl.java
@@ -17,6 +17,7 @@
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 import javax.ws.rs.core.MultivaluedMap;
@@ -164,11 +165,16 @@ public Boolean isDefaultInstance() {
      * @throws InvalidValueException invalid query parameter
      */
     public static PaginationImpl parseQueryParams(Class<?> entityClass,
-                                                  final MultivaluedMap<String, String> queryParams,
+                                                  final Optional<MultivaluedMap<String, String>> queryParams,
                                                   ElideSettings elideSettings)
             throws InvalidValueException {
+
+        if (! queryParams.isPresent()) {
+            return getDefaultPagination(entityClass, elideSettings);
+        }
+
         final Map<PaginationKey, Integer> pageData = new HashMap<>();
-        queryParams.entrySet()
+        queryParams.get().entrySet()
                 .forEach(paramEntry -> {
                     final String queryParamKey = paramEntry.getKey();
                     if (PAGE_KEYS.containsKey(queryParamKey)) {

diff --git a/elide-core/src/test/java/example/packageshareable/Untransferable.java b/elide-core/src/test/java/example/packageshareable/Untransferable.java
@@ -6,7 +6,6 @@
 package example.packageshareable;
 
 import com.yahoo.elide.annotation.Include;
-import com.yahoo.elide.annotation.NonTransferable;
 
 import javax.persistence.Entity;
 import javax.persistence.FetchType;