Revert "change catalog list to use longs"

This reverts commit 1db2ff5.
geoserver · Jan 18, 2016 · 69fb9fd · 69fb9fd
1 parent 6c28905
commit 69fb9fd
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/main/src/main/java/org/geoserver/catalog/Catalog.java b/src/main/src/main/java/org/geoserver/catalog/Catalog.java
@@ -1,4 +1,4 @@
-/* (c) 2014 Open Source Geospatial Foundation - all rights reserved
+/* (c) 2014 - 2016 Open Source Geospatial Foundation - all rights reserved
  * (c) 2001 - 2013 OpenPlans
  * This code is licensed under the GPL 2.0 license, available at the root
  * application directory.

diff --git a/src/main/src/main/java/org/geoserver/catalog/CatalogFacade.java b/src/main/src/main/java/org/geoserver/catalog/CatalogFacade.java
@@ -791,6 +791,6 @@ public <T extends CatalogInfo> CloseableIterator<T> list(final Class<T> of,
      *         filter
      */
     public <T extends CatalogInfo> CloseableIterator<T> list(final Class<T> of,
-            final Filter filter, @Nullable Long offset, @Nullable Long count,
+            final Filter filter, @Nullable Integer offset, @Nullable Integer count,
             @Nullable SortBy... sortOrder);
 }
diff --git a/src/main/src/main/java/org/geoserver/catalog/impl/CatalogImpl.java b/src/main/src/main/java/org/geoserver/catalog/impl/CatalogImpl.java
@@ -1790,7 +1790,7 @@ public <T extends CatalogInfo> CloseableIterator<T> list(final Class<T> of,
 
     @Override
     public <T extends CatalogInfo> CloseableIterator<T> list(final Class<T> of,
-            final Filter filter, Long offset, Long count, SortBy sortOrder) {
+            final Filter filter, Integer offset, Integer count, SortBy sortOrder) {
         CatalogFacade facade = getFacade();
         if (sortOrder != null && !facade.canSort(of, sortOrder.getPropertyName().getPropertyName())) {
             // TODO: use GeoTools' merge-sort code to provide sorting anyways
@@ -1804,7 +1804,7 @@ public <T extends CatalogInfo> CloseableIterator<T> list(final Class<T> of,
     public <T extends CatalogInfo> T get(Class<T> type, Filter filter)
             throws IllegalArgumentException {
 
-        final Long limit = Long.valueOf(2);
+        final Integer limit = Integer.valueOf(2);
         CloseableIterator<T> it = list(type, filter, null, limit, null);
         T result = null;
         try {