gCubeSystem
/
data-miner-manager-cl
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ref 16503: Workspace folder as input 

https://support.d4science.org/issues/16503

Added support for Item ID parameter 

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-analysis/data-miner-manager-cl@179852 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2019-06-14 15:53:38 +00:00
parent 54dacbf31c
commit ccf4656027
6 changed files with 88 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.classpath
View File

@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/data-miner-manager-cl-1.7.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
<classpathentry kind="src" output="target/data-miner-manager-cl-1.8.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry excluding="**" kind="src" output="target/data-miner-manager-cl-1.7.0-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
<classpathentry excluding="**" kind="src" output="target/data-miner-manager-cl-1.8.0-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
@ -33,5 +33,5 @@
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/data-miner-manager-cl-1.7.0-SNAPSHOT/WEB-INF/classes"/>
<classpathentry kind="output" path="target/data-miner-manager-cl-1.8.0-SNAPSHOT/WEB-INF/classes"/>
</classpath>

4
distro/changelog.xml
View File

@ -1,4 +1,8 @@
<ReleaseNotes>
<Changeset component="${groupId}.${artifactId}.1-8-0"
date="2019-06-14">
<Change>Added Item Id support [ticket #16503]</Change>
</Changeset>
<Changeset component="${groupId}.${artifactId}.1-7-0"
date="2019-04-01">
<Change>Added location and zoom support [ticket #11708]</Change>

2
pom.xml
View File

@ -11,7 +11,7 @@
<groupId>org.gcube.data.analysis</groupId>
<artifactId>data-miner-manager-cl</artifactId>
<version>1.7.0-SNAPSHOT</version>
<version>1.8.0-SNAPSHOT</version>
<name>data-miner-manager-cl</name>
<description>DataMiner Manager Client Library</description>

33
src/main/java/org/gcube/data/analysis/dataminermanagercl/server/dmservice/wps/WPS2DM.java
View File

@ -24,6 +24,7 @@ import org.gcube.data.analysis.dataminermanagercl.shared.parameters.Coordinates;
import org.gcube.data.analysis.dataminermanagercl.shared.parameters.DateParameter;
import org.gcube.data.analysis.dataminermanagercl.shared.parameters.EnumParameter;
import org.gcube.data.analysis.dataminermanagercl.shared.parameters.FileParameter;
import org.gcube.data.analysis.dataminermanagercl.shared.parameters.ItemIdParameter;
import org.gcube.data.analysis.dataminermanagercl.shared.parameters.ListParameter;
import org.gcube.data.analysis.dataminermanagercl.shared.parameters.ObjectParameter;
import org.gcube.data.analysis.dataminermanagercl.shared.parameters.Parameter;
@ -165,18 +166,24 @@ public class WPS2DM {
logger.debug("WKT parameter: " + title);
converted = retrieveWKTParameter(id, title, defaultValue);
} else {
if (title.contains("[DATE]")) {
logger.debug("DATE parameter: " + title);
title = title.replace("[DATE]", "");
converted = new DateParameter(id, title, defaultValue);
if (title.contains("[ITEMID]")) {
logger.debug("ItemID parameter: " + title);
title = title.replace("[ITEMID]", "");
converted = new ItemIdParameter(id, title, defaultValue);
} else {
if (title.contains("[TIME]")) {
logger.debug("TIME parameter: " + title);
title = title.replace("[TIME]", "");
converted = new TimeParameter(id, title, defaultValue);
if (title.contains("[DATE]")) {
logger.debug("DATE parameter: " + title);
title = title.replace("[DATE]", "");
converted = new DateParameter(id, title, defaultValue);
} else {
converted = new ObjectParameter(id, title, guessPrimitiveType(guessedType),
defaultValue);
if (title.contains("[TIME]")) {
logger.debug("TIME parameter: " + title);
title = title.replace("[TIME]", "");
converted = new TimeParameter(id, title, defaultValue);
} else {
converted = new ObjectParameter(id, title, guessPrimitiveType(guessedType),
defaultValue);
}
}
}
}
@ -250,16 +257,14 @@ public class WPS2DM {
}
}
Coordinates coordinates = retrieveCoordinates(title);
String wktDescription= cleanWKTDescription(title);
String wktDescription = cleanWKTDescription(title);
WKTParameter wktParameter = new WKTParameter(id, wktDescription, wktGeometryType, coordinates, defaultValue);
logger.debug("Retrieved WKTParameter: " + wktParameter);
return wktParameter;
}
private static Coordinates retrieveCoordinates(String title) {
logger.debug("Retrieve Coordinates");
Coordinates coordinates = null;
@ -295,7 +300,7 @@ public class WPS2DM {
logger.debug("Cleaned Description: " + title);
return title;
}
/**
*
* @param maxMegaBytes

60
src/main/java/org/gcube/data/analysis/dataminermanagercl/shared/parameters/ItemIdParameter.java Normal file
View File

@ -0,0 +1,60 @@
/**
*
*/
package org.gcube.data.analysis.dataminermanagercl.shared.parameters;
/**
*
* @author Giancarlo Panichi
*
*
*/
public class ItemIdParameter extends Parameter {
private static final long serialVersionUID = -8144663261336630929L;
private String defaultValue;
/**
*
*/
public ItemIdParameter() {
super();
this.typology = ParameterType.ITEMID;
}
/**
*
* @param name
* name
* @param description
* description
* @param defaultValue
* default value
*/
public ItemIdParameter(String name, String description, String defaultValue) {
super(name, ParameterType.ITEMID, description);
this.defaultValue = defaultValue;
}
/**
* @return the defaultValue
*/
public String getDefaultValue() {
return defaultValue;
}
/**
* @param defaultValue
* the defaultValue to set
*/
public void setDefaultValue(String defaultValue) {
this.defaultValue = defaultValue;
}
@Override
public String toString() {
return "ItemIdParameter [defaultValue=" + defaultValue + ", name=" + name + ", description=" + description
+ ", typology=" + typology + ", value=" + value + "]";
}
}

2
src/main/java/org/gcube/data/analysis/dataminermanagercl/shared/parameters/ParameterType.java
View File

@ -7,5 +7,5 @@ package org.gcube.data.analysis.dataminermanagercl.shared.parameters;
*
*/
public enum ParameterType {
OBJECT, TABULAR, FILE, ENUM, LIST, COLUMN, COLUMN_LIST, TABULAR_LIST, WKT, DATE, TIME;
OBJECT, TABULAR, FILE, ITEMID, ENUM, LIST, COLUMN, COLUMN_LIST, TABULAR_LIST, WKT, DATE, TIME;
}