From eeea363c8784ddd5ac4e888f362bf51334714330 Mon Sep 17 00:00:00 2001 From: Daniele Romagnoli Date: Fri, 10 May 2013 15:48:32 +0200 Subject: [PATCH] - changing limit and offset to Integers --- .../geoserver/rest/GeoServerRESTReader.java | 2 +- ...verRESTStructuredGridCoverageReaderManager.java | 14 +++++++------- .../GeoServerRESTImageMosaicManagerTest.java | 11 +++++------ 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/src/main/java/it/geosolutions/geoserver/rest/GeoServerRESTReader.java b/src/main/java/it/geosolutions/geoserver/rest/GeoServerRESTReader.java index a6737b0..05c1dcf 100644 --- a/src/main/java/it/geosolutions/geoserver/rest/GeoServerRESTReader.java +++ b/src/main/java/it/geosolutions/geoserver/rest/GeoServerRESTReader.java @@ -655,7 +655,7 @@ public class GeoServerRESTReader { * @throws MalformedURLException * @throws UnsupportedEncodingException */ - public RESTStructuredCoverageGranulesList getGranules(final String workspace, String coverageStore, String coverage, String filter, String offset, String limit) + public RESTStructuredCoverageGranulesList getGranules(final String workspace, String coverageStore, String coverage, String filter, Integer offset, Integer limit) throws MalformedURLException, UnsupportedEncodingException { try { GeoServerRESTStructuredGridCoverageReaderManager manager = diff --git a/src/main/java/it/geosolutions/geoserver/rest/manager/GeoServerRESTStructuredGridCoverageReaderManager.java b/src/main/java/it/geosolutions/geoserver/rest/manager/GeoServerRESTStructuredGridCoverageReaderManager.java index b960165..5440f2b 100644 --- a/src/main/java/it/geosolutions/geoserver/rest/manager/GeoServerRESTStructuredGridCoverageReaderManager.java +++ b/src/main/java/it/geosolutions/geoserver/rest/manager/GeoServerRESTStructuredGridCoverageReaderManager.java @@ -129,7 +129,7 @@ public class GeoServerRESTStructuredGridCoverageReaderManager extends GeoServerR // does it exist? RESTStructuredCoverageGranulesList granulesList=null; try { - granulesList = getGranules(workspace, coverageStore, coverageStore, filter, null, "1"); + granulesList = getGranules(workspace, coverageStore, coverageStore, filter, null, 1); } catch (MalformedURLException e) { if(LOGGER.isTraceEnabled()){ LOGGER.trace(e.getMessage(), e); @@ -155,7 +155,7 @@ public class GeoServerRESTStructuredGridCoverageReaderManager extends GeoServerR // does it exist? granulesList=null; try { - granulesList = getGranules(workspace, coverageStore, coverageStore, filter, null, "1"); + granulesList = getGranules(workspace, coverageStore, coverageStore, filter, null, 1); } catch (MalformedURLException e) { if(LOGGER.isTraceEnabled()){ LOGGER.trace(e.getMessage(), e); @@ -282,7 +282,7 @@ public class GeoServerRESTStructuredGridCoverageReaderManager extends GeoServerR * @throws MalformedURLException * @throws UnsupportedEncodingException */ - public RESTStructuredCoverageGranulesList getGranules(final String workspace, String coverageStore, String coverage, String filter, String offset, String limit) + public RESTStructuredCoverageGranulesList getGranules(final String workspace, String coverageStore, String coverage, String filter, Integer offset, Integer limit) throws MalformedURLException, UnsupportedEncodingException { // checks checkString(workspace); @@ -296,12 +296,12 @@ public class GeoServerRESTStructuredGridCoverageReaderManager extends GeoServerR append = true; sUrl = HTTPUtils.append(sUrl, "?filter=", URLEncoder.encode(filter, "UTF-8")).toString(); } - if (offset != null && !offset.isEmpty()) { - sUrl = HTTPUtils.append(sUrl, append ? "&offset=" : "?offset=", offset).toString(); + if (offset != null) { + sUrl = HTTPUtils.append(sUrl, append ? "&offset=" : "?offset=", offset.toString()).toString(); append = true; } - if (limit != null && !limit.isEmpty()) { - sUrl = HTTPUtils.append(sUrl, append ? "&limit=" : "?limit=", limit).toString(); + if (limit != null) { + sUrl = HTTPUtils.append(sUrl, append ? "&limit=" : "?limit=", limit.toString()).toString(); append = true; } String result = HTTPUtils.get(sUrl, gsuser, gspass); diff --git a/src/test/java/it/geosolutions/geoserver/rest/manager/GeoServerRESTImageMosaicManagerTest.java b/src/test/java/it/geosolutions/geoserver/rest/manager/GeoServerRESTImageMosaicManagerTest.java index ca84f8c..1634102 100644 --- a/src/test/java/it/geosolutions/geoserver/rest/manager/GeoServerRESTImageMosaicManagerTest.java +++ b/src/test/java/it/geosolutions/geoserver/rest/manager/GeoServerRESTImageMosaicManagerTest.java @@ -73,6 +73,9 @@ public class GeoServerRESTImageMosaicManagerTest extends StoreIntegrationTest { @Test public void createAndDelete() throws IllegalArgumentException, MalformedURLException, UnsupportedEncodingException{ + if (!enabled()) { + return; + } GeoServerRESTStructuredGridCoverageReaderManager manager = new GeoServerRESTStructuredGridCoverageReaderManager(new URL(RESTURL), RESTUSER, RESTPW); GeoServerRESTReader reader = new GeoServerRESTReader(new URL(RESTURL), RESTUSER, RESTPW); @@ -129,14 +132,14 @@ public class GeoServerRESTImageMosaicManagerTest extends StoreIntegrationTest { // get with paging - granulesList = manager.getGranules("it.geosolutions", "mosaic", "mosaic" , null, "0", "1"); + granulesList = manager.getGranules("it.geosolutions", "mosaic", "mosaic" , null, 0, 1); assertNotNull(granulesList); assertEquals(1, granulesList.size()); assertFalse(granulesList.isEmpty()); granule = granulesList.get(0); assertNotNull(granule); - granulesList = manager.getGranules("it.geosolutions", "mosaic", "mosaic", null, null, "2"); + granulesList = manager.getGranules("it.geosolutions", "mosaic", "mosaic", null, null, 2); assertNotNull(granulesList); assertEquals(2, granulesList.size()); assertFalse(granulesList.isEmpty()); @@ -183,10 +186,6 @@ public class GeoServerRESTImageMosaicManagerTest extends StoreIntegrationTest { final File file = urlToFile(url); final String filePath = file.getAbsolutePath(); - int i=0; - i++; - - // use reflection to get the store URL since coveragestore only returns name and workspace result = manager.createOrHarvestExternal("it.geosolutions", "mosaic", "imagemosaic", filePath + File.separatorChar + fileLocation ); Assert.assertTrue(result);