Added ImageMosaic pubblicatiobn JUnit test. Fixed Unpublish issue. Various publisher enhancements.

This commit is contained in:
ccancellieri 2011-11-11 12:44:05 +01:00
parent e3ce6ab148
commit a56a08a9d0
16 changed files with 1341 additions and 832 deletions

View File

@ -68,6 +68,8 @@ public class RESTCoverageStore {
public static RESTCoverageStore build(String response) { public static RESTCoverageStore build(String response) {
if(response == null) if(response == null)
return null; return null;
if(response.isEmpty())
return new RESTCoverageStore(new Element("coverageStore")); // TODO check how to response
Element pb = JDOMBuilder.buildElement(response); Element pb = JDOMBuilder.buildElement(response);
if(pb != null) if(pb != null)

View File

@ -52,6 +52,7 @@ public abstract class GSResourceEncoder<T extends GSDimensionInfoEncoder>
final private GSMetadataEncoder<T> metadata = new GSMetadataEncoder<T>(); final private GSMetadataEncoder<T> metadata = new GSMetadataEncoder<T>();
final private Element keywordsListEncoder = new Element("keywords"); final private Element keywordsListEncoder = new Element("keywords");
/** /**
* @param rootName * @param rootName
* Actually 'feature' or 'coverage' * Actually 'feature' or 'coverage'
@ -81,7 +82,8 @@ public abstract class GSResourceEncoder<T extends GSDimensionInfoEncoder>
} }
/** /**
* @param key the name of the metadata to add (f.e.: elevation, time) * @param key
* the name of the metadata to add (f.e.: elevation, time)
* @return true if something is removed, false otherwise * @return true if something is removed, false otherwise
*/ */
public boolean delMetadata(String key) { public boolean delMetadata(String key) {
@ -92,7 +94,6 @@ public abstract class GSResourceEncoder<T extends GSDimensionInfoEncoder>
metadata.set(key, dimensionInfo.getRoot()); metadata.set(key, dimensionInfo.getRoot());
} }
public void addKeyword(String keyword) { public void addKeyword(String keyword) {
final Element el = new Element("string"); final Element el = new Element("string");
el.setText(keyword); el.setText(keyword);
@ -101,6 +102,7 @@ public abstract class GSResourceEncoder<T extends GSDimensionInfoEncoder>
/** /**
* delete a keyword from the list * delete a keyword from the list
*
* @param keyword * @param keyword
* @return true if something is removed, false otherwise * @return true if something is removed, false otherwise
*/ */
@ -109,6 +111,7 @@ public abstract class GSResourceEncoder<T extends GSDimensionInfoEncoder>
el.setText(keyword); el.setText(keyword);
return (keywordsListEncoder.removeContent(new Filter() { return (keywordsListEncoder.removeContent(new Filter() {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
public boolean matches(Object obj) { public boolean matches(Object obj) {
if (((Element) obj).getText().equals(keyword)) { if (((Element) obj).getText().equals(keyword)) {
return true; return true;
@ -126,6 +129,7 @@ public abstract class GSResourceEncoder<T extends GSDimensionInfoEncoder>
} }
private final static String PROJECTIONPOLICY = "projectionPolicy"; private final static String PROJECTIONPOLICY = "projectionPolicy";
/** /**
* NONE, REPROJECT_TO_DECLARED, FORCE_DECLARED * NONE, REPROJECT_TO_DECLARED, FORCE_DECLARED
* *
@ -153,6 +157,7 @@ public abstract class GSResourceEncoder<T extends GSDimensionInfoEncoder>
public void addName(final String name) { public void addName(final String name) {
add(NAME, name); add(NAME, name);
} }
/** /**
* Set or modify the 'name' node with a text value from 'name' * Set or modify the 'name' node with a text value from 'name'
* *
@ -171,6 +176,7 @@ public abstract class GSResourceEncoder<T extends GSDimensionInfoEncoder>
} }
private final static String TITLE = "title"; private final static String TITLE = "title";
/** /**
* Add the 'title' node with a text value from 'title' * Add the 'title' node with a text value from 'title'
* *
@ -189,6 +195,7 @@ public abstract class GSResourceEncoder<T extends GSDimensionInfoEncoder>
} }
private final static String SRS = "srs"; private final static String SRS = "srs";
/** /**
* Add the 'SRS' node with a text value from 'srs' * Add the 'SRS' node with a text value from 'srs'
* *
@ -222,17 +229,17 @@ public abstract class GSResourceEncoder<T extends GSDimensionInfoEncoder>
* @param miny * @param miny
* @param crs * @param crs
*/ */
public void addLatLonBoundingBox(double minx, double maxy, double maxx, public void addLatLonBoundingBox(double minx, double miny, double maxx,
double miny, final String crs) { double maxy, final String crs) {
add(LATLONBBMINX, String.valueOf(minx)); add(LATLONBBMINX, String.valueOf(minx));
add(LATLONBBMINY, String.valueOf(miny));
add(LATLONBBMAXY, String.valueOf(maxy)); add(LATLONBBMAXY, String.valueOf(maxy));
add(LATLONBBMAXX, String.valueOf(maxx)); add(LATLONBBMAXX, String.valueOf(maxx));
add(LATLONBBMINY, String.valueOf(miny));
add(LATLONBBCRS, crs); add(LATLONBBCRS, crs);
} }
public void setLatLonBoundingBox(double minx, double maxy, double maxx, public void setLatLonBoundingBox(double minx, double miny, double maxx,
double miny, final String crs) { double maxy, final String crs) {
set(LATLONBBMINX, String.valueOf(minx)); set(LATLONBBMINX, String.valueOf(minx));
set(LATLONBBMAXY, String.valueOf(maxy)); set(LATLONBBMAXY, String.valueOf(maxy));
set(LATLONBBMAXX, String.valueOf(maxx)); set(LATLONBBMAXX, String.valueOf(maxx));
@ -256,8 +263,8 @@ public abstract class GSResourceEncoder<T extends GSDimensionInfoEncoder>
* @param miny * @param miny
* @param crs * @param crs
*/ */
public void addNativeBoundingBox(double minx, double maxy, double maxx, public void addNativeBoundingBox(double minx, double miny, double maxx,
double miny, final String crs) { double maxy, final String crs) {
add(NATIVEBBMINX, String.valueOf(minx)); add(NATIVEBBMINX, String.valueOf(minx));
add(NATIVEBBMAXY, String.valueOf(maxy)); add(NATIVEBBMAXY, String.valueOf(maxy));
add(NATIVEBBMAXX, String.valueOf(maxx)); add(NATIVEBBMAXX, String.valueOf(maxx));
@ -265,8 +272,8 @@ public abstract class GSResourceEncoder<T extends GSDimensionInfoEncoder>
add(NATIVEBBCRS, crs); add(NATIVEBBCRS, crs);
} }
public void setNativeBoundingBox(double minx, double maxy, double maxx, public void setNativeBoundingBox(double minx, double miny, double maxx,
double miny, final String crs) { double maxy, final String crs) {
set(NATIVEBBMINX, String.valueOf(minx)); set(NATIVEBBMINX, String.valueOf(minx));
set(NATIVEBBMAXY, String.valueOf(maxy)); set(NATIVEBBMAXY, String.valueOf(maxy));
set(NATIVEBBMAXX, String.valueOf(maxx)); set(NATIVEBBMAXX, String.valueOf(maxx));

View File

@ -110,10 +110,10 @@ public class GSImageMosaicEncoder extends GSCoverageEncoder {
* @param val * @param val
*/ */
public void addFilter(final String val){ public void addFilter(final String val){
final Element param=new Element(ENTRY); final List<Element> list=new ArrayList<Element>(2);
param.addContent(new Element(STRING).setText(filter)); list.add(new Element(STRING).setText(filter));
param.addContent(new Element(STRING).setText(val)); list.add(new Element(STRING).setText(val));
parameters.add(null,param); parameters.add(null,list);
} }
private final static Filter filterFilter=new parametersFilter(filter); private final static Filter filterFilter=new parametersFilter(filter);

View File

@ -50,7 +50,7 @@ import org.springframework.core.io.ClassPathResource;
public class ConfigTest extends GeoserverRESTTest { public class ConfigTest extends GeoserverRESTTest {
private final static Logger LOGGER = Logger.getLogger(ConfigTest.class); private final static Logger LOGGER = Logger.getLogger(ConfigTest.class);
private static final String DEFAULT_WS = "it.geosolutions"; private static final String DEFAULT_WS = "geosolutions";
public ConfigTest(String testName) { public ConfigTest(String testName) {

View File

@ -175,7 +175,6 @@ public class GeoserverRESTPublisherTest extends GeoserverRESTTest {
deleteAllWorkspaces(); deleteAllWorkspaces();
assertTrue(publisher.createWorkspace(DEFAULT_WS)); assertTrue(publisher.createWorkspace(DEFAULT_WS));
// String ns = "it.geosolutions";
String storeName = "resttestshp"; String storeName = "resttestshp";
String layerName = "cities"; String layerName = "cities";

View File

@ -0,0 +1,3 @@
TimeAttribute=time
Schema= the_geom:Polygon,location:String,time:java.util.Date
PropertyCollectors=TimestampFileNameExtractorSPI[timeregex](time)

View File

@ -0,0 +1 @@
regex=[a-z]{5,5}

View File

@ -0,0 +1 @@
regex=[0-9]{6}