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

fix GeoserverRESTPostgisDatastore options pubblication and tests

Browse Source
This commit is contained in:
ccancellieri 2011-10-11 15:50:42 +02:00
parent 76e615a400
commit fa22471878
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/it/geosolutions/geoserver/rest/encoder/GSPostGISDatastoreEncoder.java
View File

@ -44,6 +44,7 @@ public class GSPostGISDatastoreEncoder extends PropertyXMLEncoder {
super("dataStore"); super("dataStore");
addType("PostGIS"); // may be overwritten with e.g. "PostGIS (JNDI)" addType("PostGIS"); // may be overwritten with e.g. "PostGIS (JNDI)"
addDatabaseType("postgis"); addDatabaseType("postgis");
addContent(connectionParameters.getRoot());
} }
/** /**

4
src/main/java/it/geosolutions/geoserver/rest/encoder/GSResourceEncoder.java
View File

@ -48,6 +48,8 @@ import org.jdom.Element;
public abstract class GSResourceEncoder<T extends GSDimensionInfoEncoder> public abstract class GSResourceEncoder<T extends GSDimensionInfoEncoder>
extends PropertyXMLEncoder { extends PropertyXMLEncoder {
final private GSMetadataEncoder<T> metadata = new GSMetadataEncoder<T>();
final private Element keywordsListEncoder = new Element("keywords");
/** /**
* @param rootName * @param rootName
* Actually 'feature' or 'coverage' * Actually 'feature' or 'coverage'
@ -63,13 +65,11 @@ public abstract class GSResourceEncoder<T extends GSDimensionInfoEncoder>
addContent(keywordsListEncoder); addContent(keywordsListEncoder);
} }
final private GSMetadataEncoder<T> metadata = new GSMetadataEncoder<T>();
public void addMetadata(String key, T dimensionInfo) { public void addMetadata(String key, T dimensionInfo) {
metadata.add(key, dimensionInfo.getRoot()); metadata.add(key, dimensionInfo.getRoot());
} }
final private Element keywordsListEncoder = new Element("keywords");
public void addKeyword(String keyword) { public void addKeyword(String keyword) {
final Element el = new Element("string"); final Element el = new Element("string");

7
src/test/java/it/geosolutions/geoserver/rest/GeoserverRESTPostgisDatastoreTest.java
View File

@ -83,8 +83,9 @@ public class GeoserverRESTPostgisDatastoreTest extends GeoserverRESTTest {
if (!enabled()) { if (!enabled()) {
return; return;
} }
deleteAll();
String wsName = "it.geosolutions"; String wsName = DEFAULT_WS;
String datastoreName = "resttestpostgis"; String datastoreName = "resttestpostgis";
String description = "description"; String description = "description";
String dsNamespace = "http://www.geo-solutions.it"; String dsNamespace = "http://www.geo-solutions.it";
@ -107,6 +108,8 @@ public class GeoserverRESTPostgisDatastoreTest extends GeoserverRESTTest {
datastoreEncoder.addValidateConnections(validateConnections); datastoreEncoder.addValidateConnections(validateConnections);
datastoreEncoder.addPrimaryKeyMetadataTable(primaryKeyMetadataTable); datastoreEncoder.addPrimaryKeyMetadataTable(primaryKeyMetadataTable);
assertTrue(publisher.createWorkspace(wsName));
// creation test // creation test
boolean created = publisher.createPostGISDatastore(wsName, datastoreEncoder); boolean created = publisher.createPostGISDatastore(wsName, datastoreEncoder);
@ -125,6 +128,8 @@ public class GeoserverRESTPostgisDatastoreTest extends GeoserverRESTTest {
assertTrue("PostGIS datastore not removed", removed); assertTrue("PostGIS datastore not removed", removed);
else if( ! removed ) else if( ! removed )
LOGGER.error("*** Datastore " + datastoreName + " has not been removed."); LOGGER.error("*** Datastore " + datastoreName + " has not been removed.");
assertTrue(publisher.removeWorkspace(wsName));
} }
} }