From 18ff2ee78e5f973d6d95ec99d2d16dae2c70ad33 Mon Sep 17 00:00:00 2001 From: eblondel Date: Mon, 21 Oct 2013 13:46:08 +0200 Subject: [PATCH] #102 master - fixh GeoserverRESTReader to handle versioned RESTLayer --- .../geoserver/rest/GeoServerRESTReader.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/main/java/it/geosolutions/geoserver/rest/GeoServerRESTReader.java b/src/main/java/it/geosolutions/geoserver/rest/GeoServerRESTReader.java index 7104a53..944c709 100644 --- a/src/main/java/it/geosolutions/geoserver/rest/GeoServerRESTReader.java +++ b/src/main/java/it/geosolutions/geoserver/rest/GeoServerRESTReader.java @@ -34,6 +34,7 @@ import it.geosolutions.geoserver.rest.decoder.RESTDataStoreList; import it.geosolutions.geoserver.rest.decoder.RESTFeatureType; import it.geosolutions.geoserver.rest.decoder.RESTFeatureTypeList; import it.geosolutions.geoserver.rest.decoder.RESTLayer; +import it.geosolutions.geoserver.rest.decoder.RESTLayer21; import it.geosolutions.geoserver.rest.decoder.RESTLayerGroup; import it.geosolutions.geoserver.rest.decoder.RESTLayerGroupList; import it.geosolutions.geoserver.rest.decoder.RESTLayerList; @@ -571,7 +572,15 @@ public class GeoServerRESTReader { if (LOGGER.isDebugEnabled()) { LOGGER.debug("### Retrieving layer from " + url); } - return RESTLayer.build(load(url)); + + RESTLayer layer = null; + if (this.getGeoserverVersion().getVersion() + .equals(GSVersionDecoder.VERSION.UNRECOGNIZED)) { + layer = RESTLayer21.build(load(url)); + } else { + layer = RESTLayer.build(load(url)); + } + return layer; } //==========================================================================