gCubeSystem
/
dataminer-invocation-model
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
This commit is contained in:
Francesco Mangiacrapa 2018-12-11 15:04:20 +00:00
parent 31ebf86917
commit 435d092f1a
5 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/gcube/data/analysis/dminvocation/model/DataMinerInvocation.java
View File

@ -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;

2
src/main/java/org/gcube/data/analysis/dminvocation/model/DataMinerOutputParams.java
View File

@ -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;

2
src/main/java/org/gcube/data/analysis/dminvocation/model/DataMinerParameters.java
View File

@ -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;

4
src/test/java/DataMinerInvocationTest.java
View File

@ -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"));

26
src/test/resources/DataMinerInvocation.xml
View File

@ -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>