* There are no modifiable instance fields, so all the calls are thread-safe. * @@ -63,45 +63,36 @@ public class GeoServerRESTPublisher { public static final String DEFAULT_CRS = "EPSG:4326"; - /** The logger for this class */ - private static final Logger LOGGER = LoggerFactory.getLogger(GeoServerRESTPublisher.class); - - /** - * GeoServer instance base URL. E.g.: - * http://localhost:8080/geoserver. - */ - private final String restURL; - - /** - * GeoServer instance privileged username, with read & write permission on - * REST API - */ - private final String gsuser; - - /** - * GeoServer instance password for privileged username with r&w permission - * on REST API - */ - private final String gspass; + /** The logger for this class */ + private static final Logger LOGGER = LoggerFactory.getLogger(GeoServerRESTPublisher.class); /** - * Creates a GeoServerRESTPublisher to connect against a GeoServer - * instance with the given URL and user credentials. - * - * @param restURL - * the base GeoServer URL (e.g.: - * http://localhost:8080/geoserver) - * @param username - * auth credential - * @param password - * auth credential + * GeoServer instance base URL. E.g.: http://localhost:8080/geoserver. */ - public GeoServerRESTPublisher(String restURL, String username, - String password) { - this.restURL = HTTPUtils.decurtSlash(restURL); - this.gsuser = username; - this.gspass = password; - } + private final String restURL; + + /** + * GeoServer instance privileged username, with read & write permission on REST API + */ + private final String gsuser; + + /** + * GeoServer instance password for privileged username with r&w permission on REST API + */ + private final String gspass; + + /** + * Creates a GeoServerRESTPublisher to connect against a GeoServer instance with the given URL and user credentials. + * + * @param restURL the base GeoServer URL (e.g.: http://localhost:8080/geoserver) + * @param username auth credential + * @param password auth credential + */ + public GeoServerRESTPublisher(String restURL, String username, String password) { + this.restURL = HTTPUtils.decurtSlash(restURL); + this.gsuser = username; + this.gspass = password; + } // ========================================================================== // === BACKUP and RESTORE @@ -110,62 +101,45 @@ public class GeoServerRESTPublisher { /** * Issues a GeoServer BACKUP. *
- * Won't include data, cached tiles, or logs. Use - * {@link #backup(String, boolean, boolean, boolean)} to control these - * parameters. + * Won't include data, cached tiles, or logs. Use {@link #backup(String, boolean, boolean, boolean)} to control these parameters. * - * @param backupDir - * the target Backup Dir String. + * @param backupDir the target Backup Dir String. * * @return id of the backup. - * @throws IllegalArgumentException - * if the backupDir is null or empty + * @throws IllegalArgumentException if the backupDir is null or empty */ - public String backup(final String backupDir) throws IllegalArgumentException - { - /* - * This is the equivalent call with cUrl: - * - * {@code curl -u admin:geoserver -XPOST \ - * -H 'Content-type: text/xml' \ - * --data "<task><path>${BACKUP_DATADIR}</path></task>" \ - * ${restURL}/rest/bkprst/backup} - */ + public String backup(final String backupDir) throws IllegalArgumentException { + /* + * This is the equivalent call with cUrl: + * + * {@code curl -u admin:geoserver -XPOST \ -H 'Content-type: text/xml' \ --data + * "<task><path>${BACKUP_DATADIR}</path></task>" \ ${restURL}/rest/bkprst/backup} + */ return backup(backupDir, false, false, false); } /** * Issues a GeoServer BACKUP. * - * @param backupDir - * the target Backup Dir String. - * @param includedata - * whether or not include the data dir Boolean. - * @param includegwc - * whether or not include the geowebcache dir Boolean. - * @param includelog - * whether or not include the log dir Boolean. + * @param backupDir the target Backup Dir String. + * @param includedata whether or not include the data dir Boolean. + * @param includegwc whether or not include the geowebcache dir Boolean. + * @param includelog whether or not include the log dir Boolean. * * @return id of the backup. - * @throws IllegalArgumentException - * if the backupDir is null or empty. + * @throws IllegalArgumentException if the backupDir is null or empty. */ - public String backup(final String backupDir, - final boolean includedata, - final boolean includegwc, - final boolean includelog) throws IllegalArgumentException - { - /* This is the equivalent call with cUrl: - * - * {@code curl -u admin:geoserver -XPOST \ - * -H 'Content-type: text/xml' \ - * --data "<task><path>${BACKUP_DATADIR}</path><includedata>${includedata}</includedata><includegwc>${includegwc}</includegwc><includelog>${includelog}</includelog></task>" \ - * ${restURL}/rest/bkprst/backup} - */ - if ((backupDir == null) || backupDir.isEmpty()) - { - throw new IllegalArgumentException( - "The backup_dir must not be null or empty"); + public String backup(final String backupDir, final boolean includedata, + final boolean includegwc, final boolean includelog) throws IllegalArgumentException { + /* + * This is the equivalent call with cUrl: + * + * {@code curl -u admin:geoserver -XPOST \ -H 'Content-type: text/xml' \ --data + * "<task><path>${BACKUP_DATADIR}</path><includedata>${includedata}</includedata><includegwc>${includegwc}</includegwc><includelog>${includelog}</includelog></task>" + * \ ${restURL}/rest/bkprst/backup} + */ + if ((backupDir == null) || backupDir.isEmpty()) { + throw new IllegalArgumentException("The backup_dir must not be null or empty"); } StringBuilder bkpUrl = new StringBuilder(restURL); @@ -175,8 +149,8 @@ public class GeoServerRESTPublisher { bkpenc.setIncludeData(includedata); bkpenc.setIncludeGwc(includegwc); bkpenc.setIncludeLog(includelog); - final String result = HTTPUtils.post(bkpUrl.toString(), bkpenc.toString(), - "text/xml", gsuser, gspass); + final String result = HTTPUtils.post(bkpUrl.toString(), bkpenc.toString(), "text/xml", + gsuser, gspass); return result; } @@ -184,395 +158,371 @@ public class GeoServerRESTPublisher { /** * Issues a GeoServer RESTORE. * - * @param backupDir - * the source backup dir. + * @param backupDir the source backup dir. * * @return id of the backup. - * @throws IllegalArgumentException - * if the backupDir is null or empty + * @throws IllegalArgumentException if the backupDir is null or empty */ - public String restore(final String backupDir) throws IllegalArgumentException - { + public String restore(final String backupDir) throws IllegalArgumentException { /* * This is the equivalent call with cUrl: - * - * {@code curl -u admin:geoserver -XPOST \ - * -H 'Content-type: text/xml' \ - * --data "<task><path>${BACKUP_DATADIR}</path></task>" \ - * ${restURL}/rest/bkprst/restore} + * + * {@code curl -u admin:geoserver -XPOST \ -H 'Content-type: text/xml' \ --data + * "<task><path>${BACKUP_DATADIR}</path></task>" \ ${restURL}/rest/bkprst/restore} */ - if ((backupDir == null) || backupDir.isEmpty()) - { - throw new IllegalArgumentException( - "The backup_dir must not be null or empty"); + if ((backupDir == null) || backupDir.isEmpty()) { + throw new IllegalArgumentException("The backup_dir must not be null or empty"); } StringBuilder bkpUrl = new StringBuilder(restURL); bkpUrl.append("/rest/bkprst/restore"); final GSBackupEncoder bkpenc = new GSBackupEncoder(backupDir); - - final String result = HTTPUtils.post(bkpUrl.toString(), bkpenc.toString(), - "text/xml", gsuser, gspass); + + final String result = HTTPUtils.post(bkpUrl.toString(), bkpenc.toString(), "text/xml", + gsuser, gspass); return result; } - // ========================================================================== - // === WORKSPACES - // ========================================================================== + // ========================================================================== + // === WORKSPACES + // ========================================================================== /** * Create a new Workspace. *
- * GeoServer will automatically create an associated Namespace with the URI
- * being "http://{workspaceName}". To specify a custom Namespace URI, use
+ * GeoServer will automatically create an associated Namespace with the URI being "http://{workspaceName}". To specify a custom Namespace URI, use
* {@link #createWorkspace(String, URI)}.
*
- * @param workspace
- * The name of the new workspace.
+ * @param workspace The name of the new workspace.
*
* @return true if the workspace was created.
*/
- public boolean createWorkspace(final String workspace) {
- /* This is the equivalent call with cUrl:
- *
- * {@code curl -u admin:geoserver -XPOST \
- * -H 'Content-type: text/xml' \
- * -d "
* Note that this method is equivalent to {@link #createNamespace}. * - * @param name - * Name for the new workspace, which will be also its associated - * namespace prefix. - * @param uri - * Namespace URI. Cannot be empty. - * @return true if the Workspace and its associated namespace were - * successfully created. + * @param name Name for the new workspace, which will be also its associated namespace prefix. + * @param uri Namespace URI. Cannot be empty. + * @return true if the Workspace and its associated namespace were successfully created. */ - public boolean createWorkspace(final String name, final URI uri) { - // This is really an alias to createNamespace, as GeoServer - // will automatically create the associated workspace as well. - return createNamespace(name, uri); - } - - // ========================================================================== - // === NAMESPACES - // ========================================================================== + public boolean createWorkspace(final String name, final URI uri) { + // This is really an alias to createNamespace, as GeoServer + // will automatically create the associated workspace as well. + return createNamespace(name, uri); + } + + // ========================================================================== + // === NAMESPACES + // ========================================================================== /** - * Create a new Namespace. GeoServer will automatically create the - * corresponding Workspace. + * Create a new Namespace. GeoServer will automatically create the corresponding Workspace. * - * Prefix and URI are mandatory and cannot be empty. If a Namespace with the - * given prefix already exists, it won't be created. + * Prefix and URI are mandatory and cannot be empty. If a Namespace with the given prefix already exists, it won't be created. * - * @param prefix - * The name of the new Namespace. - * @param uri - * The URI of the new Namespace. + * @param prefix The name of the new Namespace. + * @param uri The URI of the new Namespace. * * @return true if the Namespace was successfully created. - * @see - * GeoServer Documentation + * @see GeoServer Documentation */ - public boolean createNamespace(final String prefix, final URI uri) { - final String sUrl = restURL + "/rest/namespaces"; - final GSNamespaceEncoder nsenc = new GSNamespaceEncoder(prefix, uri); - final String nsxml = nsenc.toString(); - final String result = HTTPUtils.postXml(sUrl, nsxml, gsuser, gspass); - return result != null; - } - + public boolean createNamespace(final String prefix, final URI uri) { + final String sUrl = restURL + "/rest/namespaces"; + final GSNamespaceEncoder nsenc = new GSNamespaceEncoder(prefix, uri); + final String nsxml = nsenc.toString(); + final String result = HTTPUtils.postXml(sUrl, nsxml, gsuser, gspass); + return result != null; + } + /** * Update a Namespace URI. * - * Prefix and URI are mandatory and cannot be empty. A Namespace with the - * given prefix should exist. + * Prefix and URI are mandatory and cannot be empty. A Namespace with the given prefix should exist. * - * @param prefix - * The prefix of an existing Namespace. - * @param uri - * The new URI. + * @param prefix The prefix of an existing Namespace. + * @param uri The new URI. * * @return true if the Namespace was successfully updated. */ - public boolean updateNamespace(final String prefix, final URI uri) { - final String sUrl = restURL + "/rest/namespaces/"+ encode(prefix); - final GSNamespaceEncoder nsenc = new GSNamespaceEncoder(prefix, uri); - final String nsxml = nsenc.toString(); - final String result = HTTPUtils.put(sUrl, nsxml, "application/xml", gsuser, gspass); - return result != null; - } - + public boolean updateNamespace(final String prefix, final URI uri) { + final String sUrl = restURL + "/rest/namespaces/" + encode(prefix); + final GSNamespaceEncoder nsenc = new GSNamespaceEncoder(prefix, uri); + final String nsxml = nsenc.toString(); + final String result = HTTPUtils.put(sUrl, nsxml, "application/xml", gsuser, gspass); + return result != null; + } + /** - * Remove a given Namespace. It will remove the associated Workspace as - * well. + * Remove a given Namespace. It will remove the associated Workspace as well. * - * @param prefix - * The Namespace prefix - * @param recurse - * The recurse parameter is used to recursively delete all - * resources contained in the workspace associated with this - * Namespace. This includes data stores, coverage stores, feature - * types, etc... Allowable values for this parameter are - * true or false. The default (safer) value is - * false. + * @param prefix The Namespace prefix + * @param recurse The recurse parameter is used to recursively delete all resources contained in the workspace associated with this Namespace. + * This includes data stores, coverage stores, feature types, etc... Allowable values for this parameter are true or false. + * The default (safer) value is false. * * @return true if the Namespace was successfully removed. */ - public boolean removeNamespace(final String prefix, boolean recurse) { - // Hack: We are instead calling removeWorkspace, as DELETE on - // a namespace will leave associated workspace in an inconsistent - // state. See https://jira.codehaus.org/browse/GEOS-5075 - // TODO switch to namespace when GEOS-5075 is solved - return removeWorkspace(prefix, recurse); - } + public boolean removeNamespace(final String prefix, boolean recurse) { + // Hack: We are instead calling removeWorkspace, as DELETE on + // a namespace will leave associated workspace in an inconsistent + // state. See https://jira.codehaus.org/browse/GEOS-5075 + // TODO switch to namespace when GEOS-5075 is solved + return removeWorkspace(prefix, recurse); + } - // ========================================================================== - // === STYLES - // ========================================================================== + // ========================================================================== + // === STYLES + // ========================================================================== /** * Store and publish a Style. * - * @param sldBody - * the full SLD document as a String. + * @param sldBody the full SLD document as a String. * * @return true if the operation completed successfully. */ - public boolean publishStyle(String sldBody) { - /* This is the equivalent call with cUrl: - * - * {@code curl -u admin:geoserver -XPOST \ - * -H 'Content-type: application/vnd.ogc.sld+xml' \ - * -d @$FULLSLD \ - * http://$GSIP:$GSPORT/$SERVLET/rest/styles} - */ - try { - return publishStyle(sldBody, null); - } catch (IllegalArgumentException e) { - if (LOGGER.isErrorEnabled()) { - LOGGER.error(e.getLocalizedMessage(), e); - } - } - return false; - } + public boolean publishStyle(String sldBody) { + /* + * This is the equivalent call with cUrl: + * + * {@code curl -u admin:geoserver -XPOST \ -H 'Content-type: application/vnd.ogc.sld+xml' \ -d @$FULLSLD \ + * http://$GSIP:$GSPORT/$SERVLET/rest/styles} + */ + try { + return publishStyle(sldBody, null); + } catch (IllegalArgumentException e) { + if (LOGGER.isErrorEnabled()) { + LOGGER.error(e.getLocalizedMessage(), e); + } + } + return false; + } /** * Store and publish a Style, assigning it a name. * - * @param sldBody - * the full SLD document as a String. - * @param name - * the Style name. + * @param sldBody the full SLD document as a String. + * @param name the Style name. * * @return true if the operation completed successfully. - * @throws IllegalArgumentException - * if the style body is null or empty. + * @throws IllegalArgumentException if the style body is null or empty. */ - public boolean publishStyle(final String sldBody, final String name) - throws IllegalArgumentException { - /* - * This is the equivalent call with cUrl: + public boolean publishStyle(final String sldBody, final String name) + throws IllegalArgumentException { + /* + * This is the equivalent call with cUrl: * - * {@code curl -u admin:geoserver -XPOST \ - * -H 'Content-type: application/vnd.ogc.sld+xml' \ - * -d @$FULLSLD \ - * http://$GSIP:$GSPORT/$SERVLET/rest/styles?name=name} - */ - if (sldBody == null || sldBody.isEmpty()) { - throw new IllegalArgumentException( - "The style body may not be null or empty"); - } - StringBuilder sUrl = new StringBuilder(restURL); - sUrl.append("/rest/styles"); - if (name != null && !name.isEmpty()) { - sUrl.append("?name=").append(name); - } - final String result = HTTPUtils.post(sUrl.toString(), sldBody, - "application/vnd.ogc.sld+xml", gsuser, gspass); - return result != null; - } + * {@code curl -u admin:geoserver -XPOST \ -H 'Content-type: application/vnd.ogc.sld+xml' \ -d @$FULLSLD \ + * http://$GSIP:$GSPORT/$SERVLET/rest/styles?name=name} + */ + if (sldBody == null || sldBody.isEmpty()) { + throw new IllegalArgumentException("The style body may not be null or empty"); + } + StringBuilder sUrl = new StringBuilder(restURL); + sUrl.append("/rest/styles"); + if (name != null && !name.isEmpty()) { + sUrl.append("?name=").append(name); + } + final String result = HTTPUtils.post(sUrl.toString(), sldBody, + "application/vnd.ogc.sld+xml", gsuser, gspass); + return result != null; + } - /** - * Store and publish a Style. - * - * @param sldFile the File containing the SLD document. - * - * @return true if the operation completed successfully. - */ - public boolean publishStyle(File sldFile) { - return publishStyle(sldFile, null); - } + /** + * Store and publish a Style. + * + * @param sldFile the File containing the SLD document. + * + * @return true if the operation completed successfully. + */ + public boolean publishStyle(File sldFile) { + return publishStyle(sldFile, null); + } /** * Store and publish a Style, assigning it a name. * - * @param sldFile - * the File containing the SLD document. - * @param name - * the Style name. + * @param sldFile the File containing the SLD document. + * @param name the Style name. * * @return true if the operation completed successfully. */ - public boolean publishStyle(File sldFile, String name) { - String sUrl = restURL + "/rest/styles"; - if (name != null && !name.isEmpty()) { - sUrl += "?name=" + encode(name); - } - LOGGER.debug("POSTing new style " + name + " to " + sUrl); - String result = HTTPUtils.post(sUrl, sldFile, - "application/vnd.ogc.sld+xml", gsuser, gspass); - return result != null; - } + public boolean publishStyle(File sldFile, String name) { + String sUrl = restURL + "/rest/styles"; + if (name != null && !name.isEmpty()) { + sUrl += "?name=" + encode(name); + } + LOGGER.debug("POSTing new style " + name + " to " + sUrl); + String result = HTTPUtils + .post(sUrl, sldFile, "application/vnd.ogc.sld+xml", gsuser, gspass); + return result != null; + } /** * Update a Style. * - * @param sldBody - * the new SLD document as a String. - * @param name - * the Style name to update. + * @param sldBody the new SLD document as a String. + * @param name the Style name to update. * * @return true if the operation completed successfully. - * @throws IllegalArgumentException - * if the style body or name are null or empty. + * @throws IllegalArgumentException if the style body or name are null or empty. */ - public boolean updateStyle(final String sldBody, final String name) - throws IllegalArgumentException { - /* - * This is the equivalent call with cUrl: + public boolean updateStyle(final String sldBody, final String name) + throws IllegalArgumentException { + /* + * This is the equivalent call with cUrl: * - * {@code curl -u admin:geoserver -XPUT \ - * -H 'Content-type: application/vnd.ogc.sld+xml' \ - * -d @$FULLSLD \ - * http://$GSIP:$GSPORT/$SERVLET/rest/styles/$NAME} - */ - if (sldBody == null || sldBody.isEmpty()) { - throw new IllegalArgumentException( - "The style body may not be null or empty"); - } else if (name == null || name.isEmpty()) { - throw new IllegalArgumentException( - "The style name may not be null or empty"); - } + * {@code curl -u admin:geoserver -XPUT \ -H 'Content-type: application/vnd.ogc.sld+xml' \ -d @$FULLSLD \ + * http://$GSIP:$GSPORT/$SERVLET/rest/styles/$NAME} + */ + if (sldBody == null || sldBody.isEmpty()) { + throw new IllegalArgumentException("The style body may not be null or empty"); + } else if (name == null || name.isEmpty()) { + throw new IllegalArgumentException("The style name may not be null or empty"); + } - final StringBuilder sUrl = new StringBuilder(restURL); - sUrl.append("/rest/styles/").append(encode(name)); + final StringBuilder sUrl = new StringBuilder(restURL); + sUrl.append("/rest/styles/").append(encode(name)); - final String result = HTTPUtils.put(sUrl.toString(), sldBody, - "application/vnd.ogc.sld+xml", gsuser, gspass); - return result != null; - } + final String result = HTTPUtils.put(sUrl.toString(), sldBody, + "application/vnd.ogc.sld+xml", gsuser, gspass); + return result != null; + } /** * Update a Style. * - * @param sldFile - * the File containing the SLD document. - * @param name - * the Style name. + * @param sldFile the File containing the SLD document. + * @param name the Style name. * * @return true if the operation completed successfully. - * @throws IllegalArgumentException - * if the sldFile file or name are null or name is empty. + * @throws IllegalArgumentException if the sldFile file or name are null or name is empty. */ - public boolean updateStyle(final File sldFile, final String name) - throws IllegalArgumentException { + public boolean updateStyle(final File sldFile, final String name) + throws IllegalArgumentException { - if (sldFile == null) { - throw new IllegalArgumentException( - "Unable to updateStyle using a null parameter file"); - } else if (name == null || name.isEmpty()) { - throw new IllegalArgumentException( - "The style name may not be null or empty"); - } + if (sldFile == null) { + throw new IllegalArgumentException("Unable to updateStyle using a null parameter file"); + } else if (name == null || name.isEmpty()) { + throw new IllegalArgumentException("The style name may not be null or empty"); + } - final StringBuilder sUrl = new StringBuilder(restURL); - sUrl.append("/rest/styles/").append(encode(name)); + final StringBuilder sUrl = new StringBuilder(restURL); + sUrl.append("/rest/styles/").append(encode(name)); - final String result = HTTPUtils.put(sUrl.toString(), sldFile, - "application/vnd.ogc.sld+xml", gsuser, gspass); - return result != null; + final String result = HTTPUtils.put(sUrl.toString(), sldFile, + "application/vnd.ogc.sld+xml", gsuser, gspass); + return result != null; - } + } /** * Remove a Style. *
- * The Style will be unpublished, and (optionally) the SLD file will be - * removed. + * The Style will be unpublished, and (optionally) the SLD file will be removed. * - * @param styleName - * the name of the Style to remove. - * @param purge - * remove the related SLD file from disk. + * @param styleName the name of the Style to remove. + * @param purge remove the related SLD file from disk. * * @return true if the operation completed successfully. - * @throws IllegalArgumentException - * if styleName is null or empty. + * @throws IllegalArgumentException if styleName is null or empty. */ - public boolean removeStyle(String styleName, final boolean purge) - throws IllegalArgumentException { - if (styleName == null || styleName.isEmpty()) - throw new IllegalArgumentException( - "Check styleName parameter, it may never be null or empty"); + public boolean removeStyle(String styleName, final boolean purge) + throws IllegalArgumentException { + if (styleName == null || styleName.isEmpty()) + throw new IllegalArgumentException( + "Check styleName parameter, it may never be null or empty"); - final StringBuffer sUrl = new StringBuffer(restURL); + final StringBuffer sUrl = new StringBuffer(restURL); - // check style name - // TODO may we whant to throw an exception instead of - // change style name? - styleName = styleName.replaceAll(":", "_"); - styleName = encode(styleName); + // check style name + // TODO may we whant to throw an exception instead of + // change style name? + styleName = styleName.replaceAll(":", "_"); + styleName = encode(styleName); - sUrl.append("/rest/styles/").append(styleName); - if (purge) { - sUrl.append("?purge=true"); - } + sUrl.append("/rest/styles/").append(styleName); + if (purge) { + sUrl.append("?purge=true"); + } - return HTTPUtils.delete(sUrl.toString(), gsuser, gspass); - } + return HTTPUtils.delete(sUrl.toString(), gsuser, gspass); + } - /** - * Remove a Style. - *
- * The Style will be unpublished and the related SLD file will be removed. - * - * @param styleName - * the name of the Style to remove. - * - * @return true if the operation completed successfully. - */ - public boolean removeStyle(String styleName) { - try { - return removeStyle(styleName, true); - } catch (IllegalArgumentException e) { - if (LOGGER.isErrorEnabled()) { - LOGGER.error(e.getLocalizedMessage(), e); - } - } - return false; - } + /** + * Remove a Style. + *
+ * The Style will be unpublished and the related SLD file will be removed. + * + * @param styleName the name of the Style to remove. + * + * @return true if the operation completed successfully. + */ + public boolean removeStyle(String styleName) { + try { + return removeStyle(styleName, true); + } catch (IllegalArgumentException e) { + if (LOGGER.isErrorEnabled()) { + LOGGER.error(e.getLocalizedMessage(), e); + } + } + return false; + } // ========================================================================== // === DATASTORE PUBLISHING // ========================================================================== + /** + * + * @author cancellieri + * @deprecated use {@link StoreType} + */ + public enum DataStoreType { + /** + * Raster based data sources. + */ + COVERAGESTORES, + /** + * Vector based data sources. Can be a file in the case of a Shapefile, a database connection in the case of PostGIS, or a server in the case + * of a remote Web Feature Service. + */ + DATASTORES; + + /** + * @deprecated use {@link StoreType#getTypeNameWithFormat(StoreType, Format)} + * @param type + * @return + */ + public static String getTypeName(StoreType type) { + return StoreType.getTypeNameWithFormat(type,Format.XML); + } + + /** + * @deprecated use {@link StoreType#toString()} + */ + public String toString() { + return this.name().toLowerCase(); + } + } + /** * DataStoreType definitions. *
@@ -1075,436 +954,361 @@ public class GeoServerRESTPublisher {
*
* @see {@link #publishShp(String, String, NameValuePair[], String, UploadMethod, URI, String, ProjectionPolicy, String)}
*
- * @param workspace
- * The workspace name.
- * @param storename
- * The store name.
- * @param layername
- * The layer name.
- * @param zipFile
- * The zipped file to publish.
+ * @param workspace The workspace name.
+ * @param storename The store name.
+ * @param layername The layer name.
+ * @param zipFile The zipped file to publish.
*
* @return {@code true} if the operation completed successfully.
- * @throws FileNotFoundException
- * , IllegalArgumentException
+ * @throws FileNotFoundException , IllegalArgumentException
*/
- public boolean publishShp(String workspace, String storename,
- String datasetname, File zipFile) throws FileNotFoundException, IllegalArgumentException {
- return publishShp(workspace, storename, new NameValuePair[0], datasetname,UploadMethod.FILE, zipFile.toURI(), DEFAULT_CRS,null);
- }
+ public boolean publishShp(String workspace, String storename, String datasetname, File zipFile)
+ throws FileNotFoundException, IllegalArgumentException {
+ return publishShp(workspace, storename, new NameValuePair[0], datasetname,
+ UploadMethod.FILE, zipFile.toURI(), DEFAULT_CRS, null);
+ }
/**
* Publish a shapefile.
*
- * @param workspace
- * the name of the workspace to use
- * @param storename
- * the name of the store to create
- * @param storeParams
- * parameters to append to the url (can be null).
- * Accepted parameters are:
- *
- * Will automatically create the store and publish each shapefile as a - * layer. + * Will automatically create the store and publish each shapefile as a layer. * - * @param workspace - * the name of the workspace to use - * @param storeName - * the name of the store to create - * @param resource - * the shapefile collection. It can be: - *
- * In a POST or PUT operation the format specifies 1) the representatin of - * the content being sent to the server, and 2) the representation of the - * response to be sent back. The former is specified with the Content-type - * header. To send a representation in XML, the content type "text/xml" or - * "application/xml" would be used. The latter is specified with the Accepts - * header as specified in the above paragraph describing a GET operation. + * In a POST or PUT operation the format specifies 1) the representatin of the content being sent to the server, and 2) the representation of the + * response to be sent back. The former is specified with the Content-type header. To send a representation in XML, the content type "text/xml" or + * "application/xml" would be used. The latter is specified with the Accepts header as specified in the above paragraph describing a GET + * operation. *
* The following table defines the Content-type values for each format: *
- * First, the associated layer is removed, then the Coverage configuration - * itself. + * First, the associated layer is removed, then the Coverage configuration itself. *
* CHECKME Maybe the coveragestore has to be removed as well. * * @return true if the operation completed successfully. */ - public boolean unpublishCoverage(String workspace, String storename, - String layerName) { - try { - final String fqLayerName; + public boolean unpublishCoverage(String workspace, String storename, String layerName) { + try { + final String fqLayerName; - // this null check is here only for backward compatibility. - // workspace - // shall be mandatory. - if (workspace == null) { + // this null check is here only for backward compatibility. + // workspace + // shall be mandatory. + if (workspace == null) { - fqLayerName = layerName; + fqLayerName = layerName; - if (LOGGER.isWarnEnabled()) { - LOGGER.warn("Null workspace while configuring layer : " - + layerName + " -- This behavior is deprecated."); - } - } else { - fqLayerName = workspace + ":" + layerName; - } - // delete related layer - URL deleteLayerUrl = new URL(restURL + "/rest/layers/" - + fqLayerName); - if (LOGGER.isDebugEnabled()) { - LOGGER.debug("Going to delete " + "/rest/layers/" + fqLayerName); - } - boolean layerDeleted = HTTPUtils.delete( - deleteLayerUrl.toExternalForm(), gsuser, gspass); - if (!layerDeleted) { - LOGGER.warn("Could not delete layer '" + fqLayerName + "'"); - return false; - } - // delete the coverage - URL deleteCovUrl = new URL(restURL + "/rest/workspaces/" - + workspace + "/coveragestores/" + storename - + "/coverages/" + layerName); - if (LOGGER.isDebugEnabled()) { - LOGGER.debug("Going to delete " + "/rest/workspaces/" - + workspace + "/coveragestores/" + storename - + "/coverages/" + layerName); - } - boolean covDeleted = HTTPUtils.delete( - deleteCovUrl.toExternalForm(), gsuser, gspass); - if (!covDeleted) { - LOGGER.warn("Could not delete coverage " + workspace + ":" - + storename + "/" + layerName - + ", but layer was deleted."); - } else { - LOGGER.info("Coverage successfully deleted " + workspace + ":" - + storename + "/" + layerName); - } - return covDeleted; + if (LOGGER.isWarnEnabled()) { + LOGGER.warn("Null workspace while configuring layer : " + layerName + + " -- This behavior is deprecated."); + } + } else { + fqLayerName = workspace + ":" + layerName; + } + // delete related layer + URL deleteLayerUrl = new URL(restURL + "/rest/layers/" + fqLayerName); + if (LOGGER.isDebugEnabled()) { + LOGGER.debug("Going to delete " + "/rest/layers/" + fqLayerName); + } + boolean layerDeleted = HTTPUtils + .delete(deleteLayerUrl.toExternalForm(), gsuser, gspass); + if (!layerDeleted) { + LOGGER.warn("Could not delete layer '" + fqLayerName + "'"); + return false; + } + // delete the coverage + URL deleteCovUrl = new URL(restURL + "/rest/workspaces/" + workspace + + "/coveragestores/" + storename + "/coverages/" + layerName); + if (LOGGER.isDebugEnabled()) { + LOGGER.debug("Going to delete " + "/rest/workspaces/" + workspace + + "/coveragestores/" + storename + "/coverages/" + layerName); + } + boolean covDeleted = HTTPUtils.delete(deleteCovUrl.toExternalForm(), gsuser, gspass); + if (!covDeleted) { + LOGGER.warn("Could not delete coverage " + workspace + ":" + storename + "/" + + layerName + ", but layer was deleted."); + } else { + LOGGER.info("Coverage successfully deleted " + workspace + ":" + storename + "/" + + layerName); + } + return covDeleted; - // the covstore is still there: should we delete it? + // the covstore is still there: should we delete it? - } catch (MalformedURLException ex) { - if (LOGGER.isErrorEnabled()) - LOGGER.error(ex.getLocalizedMessage(),ex); - return false; - } - } + } catch (MalformedURLException ex) { + if (LOGGER.isErrorEnabled()) + LOGGER.error(ex.getLocalizedMessage(), ex); + return false; + } + } /** * Removes the featuretype and the associated layer. *
- * You may also want to {@link #removeDatastore(String, String) remove the
- * datastore}.
+ * You may also want to {@link #removeDatastore(String, String) remove the datastore}.
*
* @return true if the operation completed successfully.
*/
- public boolean unpublishFeatureType(String workspace, String storename,
- String layerName) {
- try {
+ public boolean unpublishFeatureType(String workspace, String storename, String layerName) {
+ try {
- final String fqLayerName;
- // this null check is here only for backward compatibility.
- // workspace
- // shall be mandatory.
- if (workspace == null) {
+ final String fqLayerName;
+ // this null check is here only for backward compatibility.
+ // workspace
+ // shall be mandatory.
+ if (workspace == null) {
- fqLayerName = layerName;
+ fqLayerName = layerName;
- if (LOGGER.isWarnEnabled()) {
- LOGGER.warn("Null workspace while configuring layer : "
- + layerName + " -- This behavior is deprecated.");
- }
- } else {
- fqLayerName = workspace + ":" + layerName;
- }
- // delete related layer
- URL deleteLayerUrl = new URL(restURL + "/rest/layers/"
- + fqLayerName);
- boolean layerDeleted = HTTPUtils.delete(
- deleteLayerUrl.toExternalForm(), gsuser, gspass);
- if (!layerDeleted) {
- LOGGER.warn("Could not delete layer '" + fqLayerName + "'");
- return false;
- }
- // delete the coverage
- URL deleteFtUrl = new URL(restURL + "/rest/workspaces/" + workspace
- + "/datastores/" + storename + "/featuretypes/" + layerName);
- boolean ftDeleted = HTTPUtils.delete(deleteFtUrl.toExternalForm(),
- gsuser, gspass);
- if (!ftDeleted) {
- LOGGER.warn("Could not delete featuretype " + workspace + ":"
- + storename + "/" + layerName
- + ", but layer was deleted.");
- } else {
- LOGGER.info("FeatureType successfully deleted " + workspace
- + ":" + storename + "/" + layerName);
- }
+ if (LOGGER.isWarnEnabled()) {
+ LOGGER.warn("Null workspace while configuring layer : " + layerName
+ + " -- This behavior is deprecated.");
+ }
+ } else {
+ fqLayerName = workspace + ":" + layerName;
+ }
+ // delete related layer
+ URL deleteLayerUrl = new URL(restURL + "/rest/layers/" + fqLayerName);
+ boolean layerDeleted = HTTPUtils
+ .delete(deleteLayerUrl.toExternalForm(), gsuser, gspass);
+ if (!layerDeleted) {
+ LOGGER.warn("Could not delete layer '" + fqLayerName + "'");
+ return false;
+ }
+ // delete the coverage
+ URL deleteFtUrl = new URL(restURL + "/rest/workspaces/" + workspace + "/datastores/"
+ + storename + "/featuretypes/" + layerName);
+ boolean ftDeleted = HTTPUtils.delete(deleteFtUrl.toExternalForm(), gsuser, gspass);
+ if (!ftDeleted) {
+ LOGGER.warn("Could not delete featuretype " + workspace + ":" + storename + "/"
+ + layerName + ", but layer was deleted.");
+ } else {
+ LOGGER.info("FeatureType successfully deleted " + workspace + ":" + storename + "/"
+ + layerName);
+ }
- return ftDeleted;
+ return ftDeleted;
- // the store is still there: should we delete it?
+ // the store is still there: should we delete it?
- } catch (MalformedURLException ex) {
- if (LOGGER.isErrorEnabled())
- LOGGER.error(ex.getLocalizedMessage(),ex);
- return false;
- }
- }
+ } catch (MalformedURLException ex) {
+ if (LOGGER.isErrorEnabled())
+ LOGGER.error(ex.getLocalizedMessage(), ex);
+ return false;
+ }
+ }
- /**
- * Remove recursively a given Datastore in a given Workspace.
- *
- * @param workspace
- * The name of the workspace
- * @param storename
- * The name of the Datastore to remove.
- * @return true if the datastore was successfully removed.
- *
- * @deprecated will be removed in next release use
- * {@link GeoServerRESTPublisher#removeDatastore(String, String, boolean)}
- */
- public boolean removeDatastore(String workspace, String storename) {
- try {
- return removeDatastore(workspace, storename, true);
- } catch (IllegalArgumentException e) {
- if (LOGGER.isErrorEnabled())
- LOGGER.error("Arguments may not be null or empty!", e);
- }
- return false;
- }
+ /**
+ * Remove recursively a given Datastore in a given Workspace.
+ *
+ * @param workspace The name of the workspace
+ * @param storename The name of the Datastore to remove.
+ * @return true if the datastore was successfully removed.
+ *
+ * @deprecated will be removed in next release use {@link GeoServerRESTPublisher#removeDatastore(String, String, boolean)}
+ */
+ public boolean removeDatastore(String workspace, String storename) {
+ try {
+ return removeDatastore(workspace, storename, true);
+ } catch (IllegalArgumentException e) {
+ if (LOGGER.isErrorEnabled())
+ LOGGER.error("Arguments may not be null or empty!", e);
+ }
+ return false;
+ }
- /**
- * Remove a given Datastore in a given Workspace.
- *
- * @param workspace
- * The name of the workspace
- * @param storename
- * The name of the Datastore to remove.
- * @param recurse
- * if remove should be performed recursively
- * @throws IllegalArgumentException
- * if workspace or storename are null or empty
- * @return true if the datastore was successfully removed.
- */
- public boolean removeDatastore(String workspace, String storename,
- final boolean recurse) throws IllegalArgumentException {
- try {
- if (workspace == null || storename == null)
- throw new IllegalArgumentException("Arguments may not be null!");
- if (workspace.isEmpty() || storename.isEmpty())
- throw new IllegalArgumentException(
- "Arguments may not be empty!");
+ /**
+ * Remove a given Datastore in a given Workspace.
+ *
+ * @param workspace The name of the workspace
+ * @param storename The name of the Datastore to remove.
+ * @param recurse if remove should be performed recursively
+ * @throws IllegalArgumentException if workspace or storename are null or empty
+ * @return true if the datastore was successfully removed.
+ */
+ public boolean removeDatastore(String workspace, String storename, final boolean recurse)
+ throws IllegalArgumentException {
+ try {
+ if (workspace == null || storename == null)
+ throw new IllegalArgumentException("Arguments may not be null!");
+ if (workspace.isEmpty() || storename.isEmpty())
+ throw new IllegalArgumentException("Arguments may not be empty!");
- final StringBuilder url = new StringBuilder(restURL);
- url.append("/rest/workspaces/").append(workspace)
- .append("/datastores/").append(storename);
- if (recurse)
- url.append("?recurse=true");
- final URL deleteStore = new URL(url.toString());
+ final StringBuilder url = new StringBuilder(restURL);
+ url.append("/rest/workspaces/").append(workspace).append("/datastores/")
+ .append(storename);
+ if (recurse)
+ url.append("?recurse=true");
+ final URL deleteStore = new URL(url.toString());
- boolean deleted = HTTPUtils.delete(deleteStore.toExternalForm(),
- gsuser, gspass);
- if (!deleted) {
- LOGGER.warn("Could not delete datastore " + workspace + ":"
- + storename);
- } else {
- LOGGER.info("Datastore successfully deleted " + workspace + ":"
- + storename);
- }
+ boolean deleted = HTTPUtils.delete(deleteStore.toExternalForm(), gsuser, gspass);
+ if (!deleted) {
+ LOGGER.warn("Could not delete datastore " + workspace + ":" + storename);
+ } else {
+ LOGGER.info("Datastore successfully deleted " + workspace + ":" + storename);
+ }
- return deleted;
- } catch (MalformedURLException ex) {
- if (LOGGER.isErrorEnabled())
- LOGGER.error(ex.getLocalizedMessage(),ex);
- return false;
- }
- }
+ return deleted;
+ } catch (MalformedURLException ex) {
+ if (LOGGER.isErrorEnabled())
+ LOGGER.error(ex.getLocalizedMessage(), ex);
+ return false;
+ }
+ }
- /**
- * Remove recursively a given CoverageStore in a given Workspace.
- *
- * @param workspace
- * The name of the workspace
- * @param storename
- * The name of the CoverageStore to remove.
- * @return true if the CoverageStore was successfully removed.
- * @deprecated use {@link #removeCoverageStore(String, String, boolean)}
- */
- public boolean removeCoverageStore(String workspace, String storename) {
- try {
- return removeCoverageStore(workspace, storename, true);
- } catch (IllegalArgumentException e) {
- if (LOGGER.isErrorEnabled())
- LOGGER.error("Arguments may not be null or empty!", e);
- }
- return false;
- }
+ /**
+ * Remove recursively a given CoverageStore in a given Workspace.
+ *
+ * @param workspace The name of the workspace
+ * @param storename The name of the CoverageStore to remove.
+ * @return true if the CoverageStore was successfully removed.
+ * @deprecated use {@link #removeCoverageStore(String, String, boolean)}
+ */
+ public boolean removeCoverageStore(String workspace, String storename) {
+ try {
+ return removeCoverageStore(workspace, storename, true);
+ } catch (IllegalArgumentException e) {
+ if (LOGGER.isErrorEnabled())
+ LOGGER.error("Arguments may not be null or empty!", e);
+ }
+ return false;
+ }
- /**
- * Remove a given CoverageStore in a given Workspace.
- *
- * @param workspace
- * The name of the workspace
- * @param storename
- * The name of the CoverageStore to remove.
- * @param recurse
- * if remove should be performed recursively
- * @return true if the CoverageStore was successfully removed.
- */
- public boolean removeCoverageStore(final String workspace,
- final String storename, final boolean recurse)
- throws IllegalArgumentException {
- try {
- if (workspace == null || storename == null)
- throw new IllegalArgumentException("Arguments may not be null!");
- if (workspace.isEmpty() || storename.isEmpty())
- throw new IllegalArgumentException(
- "Arguments may not be empty!");
+ /**
+ * Remove a given CoverageStore in a given Workspace.
+ *
+ * @param workspace The name of the workspace
+ * @param storename The name of the CoverageStore to remove.
+ * @param recurse if remove should be performed recursively
+ * @return true if the CoverageStore was successfully removed.
+ */
+ public boolean removeCoverageStore(final String workspace, final String storename,
+ final boolean recurse) throws IllegalArgumentException {
+ try {
+ if (workspace == null || storename == null)
+ throw new IllegalArgumentException("Arguments may not be null!");
+ if (workspace.isEmpty() || storename.isEmpty())
+ throw new IllegalArgumentException("Arguments may not be empty!");
- final StringBuilder url = new StringBuilder(restURL);
- url.append("/rest/workspaces/").append(workspace)
- .append("/coveragestores/").append(storename);
- if (recurse)
- url.append("?recurse=true");
- final URL deleteStore = new URL(url.toString());
+ final StringBuilder url = new StringBuilder(restURL);
+ url.append("/rest/workspaces/").append(workspace).append("/coveragestores/")
+ .append(storename);
+ if (recurse)
+ url.append("?recurse=true");
+ final URL deleteStore = new URL(url.toString());
- boolean deleted = HTTPUtils.delete(deleteStore.toExternalForm(),
- gsuser, gspass);
- if (!deleted) {
- LOGGER.warn("Could not delete CoverageStore " + workspace + ":"
- + storename);
- } else {
- LOGGER.info("CoverageStore successfully deleted " + workspace
- + ":" + storename);
- }
- return deleted;
+ boolean deleted = HTTPUtils.delete(deleteStore.toExternalForm(), gsuser, gspass);
+ if (!deleted) {
+ LOGGER.warn("Could not delete CoverageStore " + workspace + ":" + storename);
+ } else {
+ LOGGER.info("CoverageStore successfully deleted " + workspace + ":" + storename);
+ }
+ return deleted;
- } catch (MalformedURLException ex) {
- if (LOGGER.isErrorEnabled())
- LOGGER.error(ex.getLocalizedMessage(),ex);
- return false;
- }
- }
+ } catch (MalformedURLException ex) {
+ if (LOGGER.isErrorEnabled())
+ LOGGER.error(ex.getLocalizedMessage(), ex);
+ return false;
+ }
+ }
- /**
- * Remove the workspace given Workspace using default parameters
- *
- * @see {@link GeoServerRESTPublisher#removeWorkspace(String, boolean)}
- * @param workspace
- * the workspace to remove
- * @return true if success, false otherwise
- * @deprecated {@link #removeWorkspace(String, boolean)}
- */
- public boolean removeWorkspace(String workspace) {
- try {
- return removeWorkspace(workspace, false);
- } catch (IllegalArgumentException e) {
- if (LOGGER.isErrorEnabled())
- LOGGER.error("Arguments may not be null or empty!", e);
- }
- return false;
- }
+ /**
+ * Remove the workspace given Workspace using default parameters
+ *
+ * @see {@link GeoServerRESTPublisher#removeWorkspace(String, boolean)}
+ * @param workspace the workspace to remove
+ * @return true if success, false otherwise
+ * @deprecated {@link #removeWorkspace(String, boolean)}
+ */
+ public boolean removeWorkspace(String workspace) {
+ try {
+ return removeWorkspace(workspace, false);
+ } catch (IllegalArgumentException e) {
+ if (LOGGER.isErrorEnabled())
+ LOGGER.error("Arguments may not be null or empty!", e);
+ }
+ return false;
+ }
- /**
- * Remove a given Workspace.
- *
- * @param workspace
- * The name of the workspace
- * @param recurse
- * The recurse parameter is used to recursively delete all
- * resources contained by the specified workspace. This includes
- * data stores, coverage stores, feature types, etc... Allowable
- * values for this parameter are true or false. The
- * default value is false.
- * @return true if the WorkSpace was successfully removed.
- */
- public boolean removeWorkspace(String workspace, boolean recurse)
- throws IllegalArgumentException {
- workspace = sanitize(workspace);
- try {
- if (workspace == null)
- throw new IllegalArgumentException("Arguments may not be null!");
- if (workspace.isEmpty())
- throw new IllegalArgumentException(
- "Arguments may not be empty!");
+ /**
+ * Remove a given Workspace.
+ *
+ * @param workspace The name of the workspace
+ * @param recurse The recurse parameter is used to recursively delete all resources contained by the specified workspace. This includes data
+ * stores, coverage stores, feature types, etc... Allowable values for this parameter are true or false. The default value is
+ * false.
+ * @return true if the WorkSpace was successfully removed.
+ */
+ public boolean removeWorkspace(String workspace, boolean recurse)
+ throws IllegalArgumentException {
+ workspace = sanitize(workspace);
+ try {
+ if (workspace == null)
+ throw new IllegalArgumentException("Arguments may not be null!");
+ if (workspace.isEmpty())
+ throw new IllegalArgumentException("Arguments may not be empty!");
- StringBuffer url = new StringBuffer(restURL).append(
- "/rest/workspaces/").append(workspace);
- if (recurse)
- url.append("?recurse=true");
- final URL deleteUrl = new URL(url.toString());
- boolean deleted = HTTPUtils.delete(deleteUrl.toExternalForm(),
- gsuser, gspass);
- if (!deleted) {
- LOGGER.warn("Could not delete Workspace " + workspace);
- } else {
- LOGGER.info("Workspace successfully deleted " + workspace);
- }
+ StringBuffer url = new StringBuffer(restURL).append("/rest/workspaces/").append(
+ workspace);
+ if (recurse)
+ url.append("?recurse=true");
+ final URL deleteUrl = new URL(url.toString());
+ boolean deleted = HTTPUtils.delete(deleteUrl.toExternalForm(), gsuser, gspass);
+ if (!deleted) {
+ LOGGER.warn("Could not delete Workspace " + workspace);
+ } else {
+ LOGGER.info("Workspace successfully deleted " + workspace);
+ }
- return deleted;
- } catch (MalformedURLException ex) {
- if (LOGGER.isErrorEnabled())
- LOGGER.error(ex.getLocalizedMessage(),ex);
- return false;
- }
- }
+ return deleted;
+ } catch (MalformedURLException ex) {
+ if (LOGGER.isErrorEnabled())
+ LOGGER.error(ex.getLocalizedMessage(), ex);
+ return false;
+ }
+ }
/**
* Remove a layer group.
*
- * @param name
- * the layer group name.
+ * @param name the layer group name.
* @return true if succeeded.
*/
- public boolean removeLayerGroup(String name) {
- try {
- URL deleteUrl = new URL(restURL + "/rest/layergroups/" + name);
- boolean deleted = HTTPUtils.delete(deleteUrl.toExternalForm(),
- gsuser, gspass);
- if (!deleted) {
- if (LOGGER.isWarnEnabled())
- LOGGER.warn("Could not delete layergroup " + name);
- } else {
- if (LOGGER.isInfoEnabled())
- LOGGER.info("Layergroup successfully deleted: " + name);
- }
+ public boolean removeLayerGroup(String name) {
+ try {
+ URL deleteUrl = new URL(restURL + "/rest/layergroups/" + name);
+ boolean deleted = HTTPUtils.delete(deleteUrl.toExternalForm(), gsuser, gspass);
+ if (!deleted) {
+ if (LOGGER.isWarnEnabled())
+ LOGGER.warn("Could not delete layergroup " + name);
+ } else {
+ if (LOGGER.isInfoEnabled())
+ LOGGER.info("Layergroup successfully deleted: " + name);
+ }
- return deleted;
- } catch (MalformedURLException ex) {
- if (LOGGER.isErrorEnabled())
- LOGGER.error(ex.getLocalizedMessage(),ex);
- return false;
- }
- }
+ return deleted;
+ } catch (MalformedURLException ex) {
+ if (LOGGER.isErrorEnabled())
+ LOGGER.error(ex.getLocalizedMessage(), ex);
+ return false;
+ }
+ }
- /**
- * remove a generic given layer from a given workspace
- *
- * @param workspace
- * @param layerName
- * @return true if success
- */
- public boolean removeLayer(final String workspace, final String layerName) {
+ /**
+ * remove a generic given layer from a given workspace
+ *
+ * @param workspace
+ * @param layerName
+ * @return true if success
+ */
+ public boolean removeLayer(final String workspace, final String layerName) {
- final String fqLayerName;
+ final String fqLayerName;
- // this null check is here only for backward compatibility. workspace
- // shall be mandatory.
- if (workspace == null) {
+ // this null check is here only for backward compatibility. workspace
+ // shall be mandatory.
+ if (workspace == null) {
- fqLayerName = layerName;
+ fqLayerName = layerName;
- if (LOGGER.isWarnEnabled()) {
- LOGGER.warn("Null workspace while removing layer : "
- + layerName + " -- This behavior is deprecated.");
- }
- } else {
- fqLayerName = workspace + ":" + layerName;
- }
- if (layerName == null) {
- if (LOGGER.isErrorEnabled()) {
- LOGGER.error("Null layerName : " + layerName);
- }
- return false;
- }
+ if (LOGGER.isWarnEnabled()) {
+ LOGGER.warn("Null workspace while removing layer : " + layerName
+ + " -- This behavior is deprecated.");
+ }
+ } else {
+ fqLayerName = workspace + ":" + layerName;
+ }
+ if (layerName == null) {
+ if (LOGGER.isErrorEnabled()) {
+ LOGGER.error("Null layerName : " + layerName);
+ }
+ return false;
+ }
- final String url = restURL + "/rest/layers/" + fqLayerName;
+ final String url = restURL + "/rest/layers/" + fqLayerName;
- boolean result = HTTPUtils.delete(url, gsuser, gspass);
- if (result) {
- if (LOGGER.isInfoEnabled()) {
- LOGGER.info("Layer successfully removed: " + fqLayerName);
- }
- } else {
- if (LOGGER.isWarnEnabled())
- LOGGER.warn("Error removing layer " + fqLayerName);
- }
+ boolean result = HTTPUtils.delete(url, gsuser, gspass);
+ if (result) {
+ if (LOGGER.isInfoEnabled()) {
+ LOGGER.info("Layer successfully removed: " + fqLayerName);
+ }
+ } else {
+ if (LOGGER.isWarnEnabled())
+ LOGGER.warn("Error removing layer " + fqLayerName);
+ }
- return result;
- }
+ return result;
+ }
// ==========================================================================
// === CATALOG REFRESHING
// ==========================================================================
+ /**
+ *
+ * /workspaces/