From 435d092f1aac16f6e01bdd7410809bce9de7cfeb Mon Sep 17 00:00:00 2001
From: "francesco.mangiacrapa" <francesco.mangiacrapa@isti.cnr.it>
Date: Tue, 11 Dec 2018 15:04:20 +0000
Subject: [PATCH] removed nillable

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/data-analysis/dataminer-invocation-model@174732 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .../model/DataMinerInvocation.java            |  2 +-
 .../model/DataMinerOutputParams.java          |  2 +-
 .../model/DataMinerParameters.java            |  2 +-
 src/test/java/DataMinerInvocationTest.java    |  4 +--
 src/test/resources/DataMinerInvocation.xml    | 26 ++++++++-----------
 5 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/src/main/java/org/gcube/data/analysis/dminvocation/model/DataMinerInvocation.java b/src/main/java/org/gcube/data/analysis/dminvocation/model/DataMinerInvocation.java
index 561b142..56f5048 100644
--- a/src/main/java/org/gcube/data/analysis/dminvocation/model/DataMinerInvocation.java
+++ b/src/main/java/org/gcube/data/analysis/dminvocation/model/DataMinerInvocation.java
@@ -53,7 +53,7 @@ public class DataMinerInvocation implements Serializable{
 	@JsonProperty(value="action", required=true)
 	private ActionType actionType = ActionType.RUN;
 
-	@XmlElement(name = "parameters", required=false, nillable=true)
+	@XmlElement(name = "parameters", required=false, nillable=false)
 	@JsonProperty(required=false)
 	private DataMinerParameters parameters;
 
diff --git a/src/main/java/org/gcube/data/analysis/dminvocation/model/DataMinerOutputParams.java b/src/main/java/org/gcube/data/analysis/dminvocation/model/DataMinerOutputParams.java
index e4b2d73..4bfdf44 100644
--- a/src/main/java/org/gcube/data/analysis/dminvocation/model/DataMinerOutputParams.java
+++ b/src/main/java/org/gcube/data/analysis/dminvocation/model/DataMinerOutputParams.java
@@ -41,7 +41,7 @@ public class DataMinerOutputParams implements Serializable{
 	 */
 	private static final long serialVersionUID = -683773454747370184L;
 
-	@XmlElement(name = "param")
+	@XmlElement(name = "param", required=false, nillable=false)
 	@JsonProperty(value="param", required=true)
 	private List<DataMinerParam> params;
 
diff --git a/src/main/java/org/gcube/data/analysis/dminvocation/model/DataMinerParameters.java b/src/main/java/org/gcube/data/analysis/dminvocation/model/DataMinerParameters.java
index 829ba38..9eca21d 100644
--- a/src/main/java/org/gcube/data/analysis/dminvocation/model/DataMinerParameters.java
+++ b/src/main/java/org/gcube/data/analysis/dminvocation/model/DataMinerParameters.java
@@ -44,7 +44,7 @@ public class DataMinerParameters implements Serializable{
 	@XmlElement(name = "input", required=true, nillable=false)
 	@JsonProperty(required=true)
 	private DataMinerInputParams input;
-	@XmlElement(name = "output", required=false, nillable=true)
+	@XmlElement(name = "output", required=false, nillable=false)
 	@JsonProperty(required=false)
 	private DataMinerOutputParams output;
 
diff --git a/src/test/java/DataMinerInvocationTest.java b/src/test/java/DataMinerInvocationTest.java
index e180335..31a271a 100644
--- a/src/test/java/DataMinerInvocationTest.java
+++ b/src/test/java/DataMinerInvocationTest.java
@@ -67,7 +67,7 @@ public class DataMinerInvocationTest {
 		System.out.println(new String(outStreamXML.toByteArray()));
 	}
 
-	//@Test
+	@Test
 	public void unmarshallingXMLTest() throws JAXBException, IOException, SAXException{
 		System.out.println(DataMinerInvocationTest.class.getMethods()[1].getName()+" called");
 		FileInputStream dmInvocationXMLFile = new FileInputStream(new File("./src/test/resources/DataMinerInvocation.xml"));
@@ -83,7 +83,7 @@ public class DataMinerInvocationTest {
 
 	}
 
-	@Test
+	//@Test
 	public void unmarshallingJSONTest() throws JAXBException, IOException, SAXException{
 		System.out.println(DataMinerInvocationTest.class.getMethods()[2].getName()+" called");
 		FileInputStream dmInvocationJSONFile = new FileInputStream(new File("./src/test/resources/DataMinerInvocation.json"));
diff --git a/src/test/resources/DataMinerInvocation.xml b/src/test/resources/DataMinerInvocation.xml
index 15d7a53..a61ecae 100644
--- a/src/test/resources/DataMinerInvocation.xml
+++ b/src/test/resources/DataMinerInvocation.xml
@@ -1,17 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <dataminer-invocation>
-	<operator-id>org.gcube.dataanalysis.wps.statisticalmanager.synchserver.mappedclasses.transducerers.MPA_INTERSECT</operator-id>
-	<action>RUN</action>
-	<parameters>
-		<input>
-			<param>
-				<key>fileId</key>
-				<value>http://publicLinkToFile</value>
-			</param>
-			<param>
-				<key>param2</key>
-				<value>value2</value>
-			</param>
-		</input>
-		<output/>
-	</parameters>
+   <operator-id>org.gcube.dataanalysis.wps.statisticalmanager.synchserver.mappedclasses.transducerers.MPA_INTERSECT</operator-id>
+   <action>RUN</action>
+   <parameters>
+      <input>
+         <param>
+            <key>param2</key>
+            <value>value2</value>
+         </param>
+      </input>
+   </parameters>
 </dataminer-invocation>
\ No newline at end of file