Github/geoserver-manager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

port: simplify the publisher

Browse Source
This commit is contained in:
carlo cancellieri 2013-07-02 16:39:13 +02:00
parent 124b2b9aca
commit c61a5055cd
2 changed files with 69 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

105
src/main/java/it/geosolutions/geoserver/rest/GeoServerRESTPublisher.java
View File

@ -371,8 +371,7 @@ public class GeoServerRESTPublisher {
sUrl += "?name=" + encode(name); sUrl += "?name=" + encode(name);
} }
LOGGER.debug("POSTing new style " + name + " to " + sUrl); LOGGER.debug("POSTing new style " + name + " to " + sUrl);
String result = HTTPUtils String result = HTTPUtils.post(sUrl, sldFile, Format.SLD.getContentType(), gsuser, gspass);
.post(sUrl, sldFile, Format.SLD.getContentType(), gsuser, gspass);
return result != null; return result != null;
} }
@ -513,7 +512,7 @@ public class GeoServerRESTPublisher {
* @return * @return
*/ */
public static String getTypeName(StoreType type) { public static String getTypeName(StoreType type) {
return StoreType.getTypeNameWithFormat(type,Format.XML); return StoreType.getTypeNameWithFormat(type, Format.XML);
} }
/** /**
@ -552,7 +551,7 @@ public class GeoServerRESTPublisher {
* @return "featureTypes.{xml|html|...}" for DATASTORES, "coverages.{xml|html|...}" otherwise. * @return "featureTypes.{xml|html|...}" for DATASTORES, "coverages.{xml|html|...}" otherwise.
*/ */
public static String getTypeNameWithFormat(StoreType type, Format format) { public static String getTypeNameWithFormat(StoreType type, Format format) {
return getTypeName(type)+"."+format; return getTypeName(type) + "." + format;
} }
/** /**
@ -563,7 +562,7 @@ public class GeoServerRESTPublisher {
* @return "featuretypes.{xml|html|...}" for DATASTORES, "coverages.{xml|html|...}" otherwise. * @return "featuretypes.{xml|html|...}" for DATASTORES, "coverages.{xml|html|...}" otherwise.
*/ */
public String getTypeNameWithFormat(Format format) { public String getTypeNameWithFormat(Format format) {
return getTypeName(this).toLowerCase()+"."+format; return getTypeName(this).toLowerCase() + "." + format;
} }
/** /**
@ -774,7 +773,7 @@ public class GeoServerRESTPublisher {
ParameterConfigure configure, NameValuePair... params) throws FileNotFoundException, ParameterConfigure configure, NameValuePair... params) throws FileNotFoundException,
IllegalArgumentException { IllegalArgumentException {
if (workspace == null || dsType == null || storeName == null || method == null if (workspace == null || dsType == null || storeName == null || method == null
| extension == null || mimeType == null || uri == null) { || extension == null || mimeType == null || uri == null) {
throw new IllegalArgumentException("Null argument"); throw new IllegalArgumentException("Null argument");
} }
StringBuilder sbUrl = new StringBuilder(restURL).append("/rest/workspaces/") StringBuilder sbUrl = new StringBuilder(restURL).append("/rest/workspaces/")
@ -876,7 +875,7 @@ public class GeoServerRESTPublisher {
/** /**
* Create a PostGIS datastore. * Create a PostGIS datastore.
* *
* @deprecated Will be deleted in next version 1.6.x, use {@link GeoServerRESTStoreManager} instead. * @deprecated Will be deleted in next version 1.5.x, use {@link GeoServerRESTDatastoreManager} instead.
* *
* @param workspace Name of the workspace to contain the database. This will also be the prefix of any layer names created from tables in the * @param workspace Name of the workspace to contain the database. This will also be the prefix of any layer names created from tables in the
* database. * database.
@ -885,7 +884,7 @@ public class GeoServerRESTPublisher {
* @return <TT>true</TT> if the PostGIS datastore has been successfully created, <TT>false</TT> otherwise * @return <TT>true</TT> if the PostGIS datastore has been successfully created, <TT>false</TT> otherwise
*/ */
public boolean createPostGISDatastore(String workspace, public boolean createPostGISDatastore(String workspace,
it.geosolutions.geoserver.rest.encoder.GSPostGISDatastoreEncoder datastoreEncoder) { GSPostGISDatastoreEncoder datastoreEncoder) {
String sUrl = restURL + "/rest/workspaces/" + workspace + "/datastores/"; String sUrl = restURL + "/rest/workspaces/" + workspace + "/datastores/";
String xml = datastoreEncoder.toString(); String xml = datastoreEncoder.toString();
String result = HTTPUtils.postXml(sUrl, xml, gsuser, gspass); String result = HTTPUtils.postXml(sUrl, xml, gsuser, gspass);
@ -2008,32 +2007,7 @@ public class GeoServerRESTPublisher {
*/ */
public boolean removeDatastore(String workspace, String storename, final boolean recurse) public boolean removeDatastore(String workspace, String storename, final boolean recurse)
throws IllegalArgumentException { throws IllegalArgumentException {
try { return removeStore(workspace, storename, StoreType.DATASTORES, recurse);
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());
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;
}
} }
/** /**
@ -2045,13 +2019,7 @@ public class GeoServerRESTPublisher {
* @deprecated use {@link #removeCoverageStore(String, String, boolean)} * @deprecated use {@link #removeCoverageStore(String, String, boolean)}
*/ */
public boolean removeCoverageStore(String workspace, String storename) { public boolean removeCoverageStore(String workspace, String storename) {
try { return removeCoverageStore(workspace, storename, true);
return removeCoverageStore(workspace, storename, true);
} catch (IllegalArgumentException e) {
if (LOGGER.isErrorEnabled())
LOGGER.error("Arguments may not be null or empty!", e);
}
return false;
} }
/** /**
@ -2064,6 +2032,21 @@ public class GeoServerRESTPublisher {
*/ */
public boolean removeCoverageStore(final String workspace, final String storename, public boolean removeCoverageStore(final String workspace, final String storename,
final boolean recurse) throws IllegalArgumentException { final boolean recurse) throws IllegalArgumentException {
return removeStore(workspace, storename, StoreType.COVERAGESTORES, recurse);
}
/**
* 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 the {@link StoreType} type
* @param recurse if remove should be performed recursively
* @throws IllegalArgumentException if workspace or storename are null or empty
* @return <TT>true</TT> if the store was successfully removed.
*/
private boolean removeStore(String workspace, String storename, StoreType type,
final boolean recurse) throws IllegalArgumentException {
try { try {
if (workspace == null || storename == null) if (workspace == null || storename == null)
throw new IllegalArgumentException("Arguments may not be null!"); throw new IllegalArgumentException("Arguments may not be null!");
@ -2071,7 +2054,7 @@ public class GeoServerRESTPublisher {
throw new IllegalArgumentException("Arguments may not be empty!"); throw new IllegalArgumentException("Arguments may not be empty!");
final StringBuilder url = new StringBuilder(restURL); final StringBuilder url = new StringBuilder(restURL);
url.append("/rest/workspaces/").append(workspace).append("/coveragestores/") url.append("/rest/workspaces/").append(workspace).append("/").append(type).append("/")
.append(storename); .append(storename);
if (recurse) if (recurse)
url.append("?recurse=true"); url.append("?recurse=true");
@ -2079,12 +2062,12 @@ public class GeoServerRESTPublisher {
boolean deleted = HTTPUtils.delete(deleteStore.toExternalForm(), gsuser, gspass); boolean deleted = HTTPUtils.delete(deleteStore.toExternalForm(), gsuser, gspass);
if (!deleted) { if (!deleted) {
LOGGER.warn("Could not delete CoverageStore " + workspace + ":" + storename); LOGGER.warn("Could not delete store " + workspace + ":" + storename);
} else { } else {
LOGGER.info("CoverageStore successfully deleted " + workspace + ":" + storename); LOGGER.info("Store successfully deleted " + workspace + ":" + storename);
} }
return deleted;
return deleted;
} catch (MalformedURLException ex) { } catch (MalformedURLException ex) {
if (LOGGER.isErrorEnabled()) if (LOGGER.isErrorEnabled())
LOGGER.error(ex.getLocalizedMessage(), ex); LOGGER.error(ex.getLocalizedMessage(), ex);
@ -2101,13 +2084,7 @@ public class GeoServerRESTPublisher {
* @deprecated {@link #removeWorkspace(String, boolean)} * @deprecated {@link #removeWorkspace(String, boolean)}
*/ */
public boolean removeWorkspace(String workspace) { public boolean removeWorkspace(String workspace) {
try { return removeWorkspace(workspace, false);
return removeWorkspace(workspace, false);
} catch (IllegalArgumentException e) {
if (LOGGER.isErrorEnabled())
LOGGER.error("Arguments may not be null or empty!", e);
}
return false;
} }
/** /**
@ -2261,17 +2238,17 @@ public class GeoServerRESTPublisher {
final String store = HTTPUtils.get(url, this.gsuser, this.gspass); final String store = HTTPUtils.get(url, this.gsuser, this.gspass);
if (store != null) { if (store != null) {
String storeTag=storeType.getTypeName(); String storeTag = storeType.getTypeName();
// switch (storeType) { // switch (storeType) {
// case COVERAGESTORES: // case COVERAGESTORES:
// storeTag = storeType.toString().replaceAll("store", ""); // storeTag = storeType.toString().replaceAll("store", "");
// break; // break;
// case DATASTORES: // case DATASTORES:
// storeTag = "featureTypes"; // storeTag = "featureTypes";
// break; // break;
// default: // default:
// throw new IllegalArgumentException("Unrecognized type"); // throw new IllegalArgumentException("Unrecognized type");
// } // }
String startTag = "<" + storeTag + ">"; String startTag = "<" + storeTag + ">";
int start = store.indexOf(startTag); int start = store.indexOf(startTag);
@ -2538,7 +2515,7 @@ public class GeoServerRESTPublisher {
* *
* configured - Only setup or configured feature types are returned. This is the default value. available - Only unconfigured feature types * configured - Only setup or configured feature types are returned. This is the default value. available - Only unconfigured feature types
* (not yet setup) but are available from the specified datastore will be returned. available_with_geom - Same as available but only * (not yet setup) but are available from the specified datastore will be returned. available_with_geom - Same as available but only
* includes feature types that have a geometry attribute. all - The union of configured and available. * includes feature types that have a geometry granule. all - The union of configured and available.
* *
* *
* @return true if success * @return true if success

3
src/main/java/it/geosolutions/geoserver/rest/manager/GeoServerRESTStoreManager.java
View File

@ -25,6 +25,7 @@
package it.geosolutions.geoserver.rest.manager; package it.geosolutions.geoserver.rest.manager;
import it.geosolutions.geoserver.rest.GeoServerRESTPublisher.Format; import it.geosolutions.geoserver.rest.GeoServerRESTPublisher.Format;
import it.geosolutions.geoserver.rest.GeoServerRESTPublisher.StoreType;
import it.geosolutions.geoserver.rest.HTTPUtils; import it.geosolutions.geoserver.rest.HTTPUtils;
import it.geosolutions.geoserver.rest.encoder.GSAbstractStoreEncoder; import it.geosolutions.geoserver.rest.encoder.GSAbstractStoreEncoder;
import it.geosolutions.geoserver.rest.encoder.datastore.GSAbstractDatastoreEncoder; import it.geosolutions.geoserver.rest.encoder.datastore.GSAbstractDatastoreEncoder;
@ -120,4 +121,6 @@ public class GeoServerRESTStoreManager extends GeoServerRESTAbstractManager {
// } // }
return deleted; return deleted;
} }
} }