+ * {@code
+ *
+ * val1
+ * val2
+ * val3
+ * }
+ *
+ *
+ * @author ETj (etj at geo-solutions.it)
+ */
+public class EntryKeyListEncoder {
+
+ private Map metadata = new HashMap();
+ private final String listName;
+
+ public EntryKeyListEncoder(String listName) {
+ this.listName = listName;
+ }
+
+ public void add(String key, String value) {
+ metadata.put(key, value);
+ }
+
+ public void attachList(Element e) {
+
+ if( ! metadata.isEmpty() ) {
+ Element md = new Element(listName);
+ for (Map.Entry entry : metadata.entrySet()) {
+ md.addContent("entry")
+ .setAttribute("key", entry.getKey())
+ .setText(entry.getValue());
+ }
+ e.addContent(md);
+ }
+ }
+}
diff --git a/src/main/java/it/geosolutions/geoserver/rest/encoder/PropertyXMLEncoder.java b/src/main/java/it/geosolutions/geoserver/rest/encoder/utils/PropertyXMLEncoder.java
similarity index 75%
rename from src/main/java/it/geosolutions/geoserver/rest/encoder/PropertyXMLEncoder.java
rename to src/main/java/it/geosolutions/geoserver/rest/encoder/utils/PropertyXMLEncoder.java
index fc869c6..dc77a2a 100644
--- a/src/main/java/it/geosolutions/geoserver/rest/encoder/PropertyXMLEncoder.java
+++ b/src/main/java/it/geosolutions/geoserver/rest/encoder/utils/PropertyXMLEncoder.java
@@ -23,7 +23,7 @@
* THE SOFTWARE.
*/
-package it.geosolutions.geoserver.rest.encoder;
+package it.geosolutions.geoserver.rest.encoder.utils;
import java.util.HashMap;
import java.util.Map;
@@ -33,13 +33,15 @@ import org.jdom.output.XMLOutputter;
/**
* Creates an XML document by mapping properties to XML nodes.
- * You can set the root element in the constructor.
- * Any key/value pair will be encoded as value node.
+ * You can set the root element name in the constructor.
+ * Any key/value pair will be encoded as {@code value } node.
+ *
+ * Nested nodes
* Any key containing one or more slash ("/") will be encoded as nested nodes;
- * e.g.:
- * {@code key = "k1/k2/k3", value = "value" }
- * will be encoded as
- * {@code value
+ *
e.g.:
+ * {@code
+ * key = "k1/k2/k3", value = "value" } will be encoded as
+ * {@code value
*
* @author ETj (etj at geo-solutions.it)
*/
@@ -69,20 +71,29 @@ public class PropertyXMLEncoder {
return configElements.isEmpty();
}
+ /**
+ * @return an xml document representing the stored properties.
+ */
public String encodeXml() {
- Element layer = new Element(rootName);
+ Element root = new Element(rootName);
for (String key : configElements.keySet()) {
final String value = configElements.get(key);
- add(layer, key, value);
+ add(root, key, value);
}
- addNodesBeforeOutput(layer);
- return OUTPUTTER.outputString(layer);
+ addNodesBeforeOutput(root);
+ return OUTPUTTER.outputString(root);
}
- protected void addNodesBeforeOutput(Element e) {
-
+ /**
+ * Subclasses may need to override this method if some more info in the XML
+ * string are needed when calling {@link #encodeXml() encodeXml()}.
+ *
+ * @param root the root element that will be converted into String by encodeXml
+ */
+ protected void addNodesBeforeOutput(Element root) {
+ // nothing to do, just override when needed.
}
private void add(Element e, String key, String value) {
diff --git a/src/main/java/it/geosolutions/geoserver/rest/encoder/utils/TextNodeListEncoder.java b/src/main/java/it/geosolutions/geoserver/rest/encoder/utils/TextNodeListEncoder.java
new file mode 100644
index 0000000..2cf27e5
--- /dev/null
+++ b/src/main/java/it/geosolutions/geoserver/rest/encoder/utils/TextNodeListEncoder.java
@@ -0,0 +1,79 @@
+/*
+ * GeoServer-Manager - Simple Manager Library for GeoServer
+ *
+ * Copyright (C) 2007,2011 GeoSolutions S.A.S.
+ * http://www.geo-solutions.it
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+package it.geosolutions.geoserver.rest.encoder.utils;
+
+import java.util.ArrayList;
+import java.util.List;
+import org.jdom.Element;
+
+/**
+ * Encodes lists of simple text nodes.
+ *
e.g.:
+ *
+ * {@code
+ *
+ * nodetext1
+ * nodetext2
+ * nodetext3
+ * }
+ *
+ *
+ * @author ETj (etj at geo-solutions.it)
+ */
+public class TextNodeListEncoder {
+
+ private List list = new ArrayList();
+ private final String listName;
+
+ public TextNodeListEncoder(String listName) {
+ this.listName = listName;
+ }
+
+ public void add(String nodename, String nodetext) {
+ list.add(new Pair(nodename, nodetext));
+ }
+
+ public void attachList(Element e) {
+
+ if( ! list.isEmpty() ) {
+ Element elist = new Element(listName);
+ for (Pair pair : list) {
+ elist.addContent(pair.v1).setText(pair.v2);
+ }
+ e.addContent(elist);
+ }
+ }
+
+ class Pair {
+ String v1;
+ String v2;
+
+ public Pair(String v1, String v2) {
+ this.v1 = v1;
+ this.v2 = v2;
+ }
+ }
+}
diff --git a/src/main/java/it/geosolutions/geoserver/rest/encoder/utils/package.html b/src/main/java/it/geosolutions/geoserver/rest/encoder/utils/package.html
new file mode 100644
index 0000000..58bda61
--- /dev/null
+++ b/src/main/java/it/geosolutions/geoserver/rest/encoder/utils/package.html
@@ -0,0 +1,3 @@
+
+Some util classes for encoders.
+
\ No newline at end of file
diff --git a/src/test/java/it/geosolutions/geoserver/rest/GeoserverRESTPostgisDatastoreTest.java b/src/test/java/it/geosolutions/geoserver/rest/GeoserverRESTPostgisDatastoreTest.java
new file mode 100644
index 0000000..2930d6c
--- /dev/null
+++ b/src/test/java/it/geosolutions/geoserver/rest/GeoserverRESTPostgisDatastoreTest.java
@@ -0,0 +1,130 @@
+/*
+ * GeoServer-Manager - Simple Manager Library for GeoServer
+ *
+ * Copyright (C) 2007,2011 GeoSolutions S.A.S.
+ * http://www.geo-solutions.it
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+package it.geosolutions.geoserver.rest;
+
+
+import it.geosolutions.geoserver.rest.decoder.RESTDataStore;
+import it.geosolutions.geoserver.rest.encoder.GSPostGISDatastoreEncoder;
+import org.apache.log4j.Logger;
+
+/**
+ * Testcase for creating postgis-based resources on geoserver.
+ *
+ * Since these tests require a running postgis instance, this is more like integration tests.
+ * You may skip them by defining
+ * -DpgIgnore=true
+ * When pgIgnore is defined that way, failing tests will not break
+ * the build: they will be logged as errors instead.
+ *
+ *
+ * The target postgis instance can be customized by defining the following env vars:
+ * - pgHost (default localhost)
+ * - pgPort (default: 5432)
+ * - pgDatabase (default: test)
+ * - pgSchema (default: public)
+ * - pgUser (default: utest)
+ * - pgPassword (default: ptest)
+ *
+ *
+ * @author etj
+ * @author Eric Grosso
+ *
+ * @see GeoserverRESTTest
+ */
+public class GeoserverRESTPostgisDatastoreTest extends GeoserverRESTTest {
+
+ private final static Logger LOGGER = Logger.getLogger(GeoserverRESTPostgisDatastoreTest.class);
+ private static final String DEFAULT_WS = "it.geosolutions";
+
+ private final boolean pgIgnore;
+ private final String pgHost;
+ private final int pgPort;
+ private final String pgDatabase;
+ private final String pgSchema;
+ private final String pgUser;
+ private final String pgPassword;
+
+ public GeoserverRESTPostgisDatastoreTest(String testName) {
+ super(testName);
+
+ pgIgnore = System.getProperty("pgIgnore", "false").equalsIgnoreCase("true");
+ pgHost = System.getProperty("pgHost", "localhost");
+ pgPort = Integer.parseInt(System.getProperty("pgPort", "5432"));
+ pgDatabase = System.getProperty("pgDatabase", "test");
+ pgSchema = System.getProperty("pgSchema", "public");
+ pgUser = System.getProperty("pgUser", "utest");
+ pgPassword = System.getProperty("pgPassword", "ptest");
+ }
+
+ public void testCreateDeletePostGISDatastore() {
+ if (!enabled()) {
+ return;
+ }
+
+ String wsName = "it.geosolutions";
+ String datastoreName = "resttestpostgis";
+ String description = "description";
+ String dsNamespace = "http://www.geo-solutions.it";
+ boolean exposePrimaryKeys = true;
+ boolean validateConnections = false;
+ String primaryKeyMetadataTable = "test";
+
+ GSPostGISDatastoreEncoder datastoreEncoder = new GSPostGISDatastoreEncoder();
+ datastoreEncoder.defaultInit();
+ datastoreEncoder.setName(datastoreName);
+ datastoreEncoder.setDescription(description);
+ datastoreEncoder.setNamespace(dsNamespace);
+ datastoreEncoder.setHost(pgHost);
+ datastoreEncoder.setPort(pgPort);
+ datastoreEncoder.setDatabase(pgDatabase);
+ datastoreEncoder.setSchema(pgSchema);
+ datastoreEncoder.setUser(pgUser);
+ datastoreEncoder.setPassword(pgPassword);
+ datastoreEncoder.setExposePrimaryKeys(exposePrimaryKeys);
+ datastoreEncoder.setValidateConnections(validateConnections);
+ datastoreEncoder.setPrimaryKeyMetadataTable(primaryKeyMetadataTable);
+
+ // creation test
+ boolean created = publisher.createPostGISDatastore(wsName, datastoreEncoder);
+
+ if( ! pgIgnore )
+ assertTrue("PostGIS datastore not created", created);
+ else if( ! created)
+ LOGGER.error("*** Datastore " + datastoreName + " has not been created.");
+
+
+ RESTDataStore datastore = reader.getDatastore(wsName, datastoreName);
+ LOGGER.info("The type of the created datastore is: " + datastore.getType());
+
+ // removing test
+ boolean removed = publisher.removeDatastore(wsName, datastoreName);
+ if( ! pgIgnore )
+ assertTrue("PostGIS datastore not removed", removed);
+ else if( ! removed )
+ LOGGER.error("*** Datastore " + datastoreName + " has not been removed.");
+ }
+
+}
diff --git a/src/test/java/it/geosolutions/geoserver/rest/GeoserverRESTTest.java b/src/test/java/it/geosolutions/geoserver/rest/GeoserverRESTTest.java
index 2d50bac..142ba6c 100644
--- a/src/test/java/it/geosolutions/geoserver/rest/GeoserverRESTTest.java
+++ b/src/test/java/it/geosolutions/geoserver/rest/GeoserverRESTTest.java
@@ -42,9 +42,14 @@ import org.apache.log4j.Logger;
/**
* Initializes REST params.
*
- * Default target geoserver instance is at http://localhost:8080/geoserver.
- *
Connection parameters can be customized by defining env vars
- * resturl, restuser, restpw,
+ * These tests are destructive, so you have to explicitly enable them
+ * by setting the env var resttest to true.
+ *
+ * The target geoserver instance can be customized by defining the following env vars:
+ * - resturl (default http://localhost:8080/geoserver)
+ * - restuser (default: admin)
+ * - restpw (default: geoserver)
+ *
*
* @author etj
*/