diff --git a/.classpath b/.classpath
index b1b720d..7039a7f 100644
--- a/.classpath
+++ b/.classpath
@@ -1,12 +1,12 @@
-
+
-
+
@@ -33,5 +33,5 @@
-
+
diff --git a/distro/changelog.xml b/distro/changelog.xml
index d1c7571..30aba31 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -1,4 +1,8 @@
+
+ Added Item Id support [ticket #16503]
+
Added location and zoom support [ticket #11708]
diff --git a/pom.xml b/pom.xml
index ba74b9a..131ff96 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
org.gcube.data.analysis
data-miner-manager-cl
- 1.7.0-SNAPSHOT
+ 1.8.0-SNAPSHOT
data-miner-manager-cl
DataMiner Manager Client Library
diff --git a/src/main/java/org/gcube/data/analysis/dataminermanagercl/server/dmservice/wps/WPS2DM.java b/src/main/java/org/gcube/data/analysis/dataminermanagercl/server/dmservice/wps/WPS2DM.java
index 49a54d2..2d58a0f 100644
--- a/src/main/java/org/gcube/data/analysis/dataminermanagercl/server/dmservice/wps/WPS2DM.java
+++ b/src/main/java/org/gcube/data/analysis/dataminermanagercl/server/dmservice/wps/WPS2DM.java
@@ -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
diff --git a/src/main/java/org/gcube/data/analysis/dataminermanagercl/shared/parameters/ItemIdParameter.java b/src/main/java/org/gcube/data/analysis/dataminermanagercl/shared/parameters/ItemIdParameter.java
new file mode 100644
index 0000000..b2bfcd4
--- /dev/null
+++ b/src/main/java/org/gcube/data/analysis/dataminermanagercl/shared/parameters/ItemIdParameter.java
@@ -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 + "]";
+ }
+
+}
diff --git a/src/main/java/org/gcube/data/analysis/dataminermanagercl/shared/parameters/ParameterType.java b/src/main/java/org/gcube/data/analysis/dataminermanagercl/shared/parameters/ParameterType.java
index 640d69d..bea11b5 100644
--- a/src/main/java/org/gcube/data/analysis/dataminermanagercl/shared/parameters/ParameterType.java
+++ b/src/main/java/org/gcube/data/analysis/dataminermanagercl/shared/parameters/ParameterType.java
@@ -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;
}
\ No newline at end of file