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:
parent
31ebf86917
commit
435d092f1a
|
@ -53,7 +53,7 @@ public class DataMinerInvocation implements Serializable{
|
||||||
@JsonProperty(value="action", required=true)
|
@JsonProperty(value="action", required=true)
|
||||||
private ActionType actionType = ActionType.RUN;
|
private ActionType actionType = ActionType.RUN;
|
||||||
|
|
||||||
@XmlElement(name = "parameters", required=false, nillable=true)
|
@XmlElement(name = "parameters", required=false, nillable=false)
|
||||||
@JsonProperty(required=false)
|
@JsonProperty(required=false)
|
||||||
private DataMinerParameters parameters;
|
private DataMinerParameters parameters;
|
||||||
|
|
||||||
|
|
|
@ -41,7 +41,7 @@ public class DataMinerOutputParams implements Serializable{
|
||||||
*/
|
*/
|
||||||
private static final long serialVersionUID = -683773454747370184L;
|
private static final long serialVersionUID = -683773454747370184L;
|
||||||
|
|
||||||
@XmlElement(name = "param")
|
@XmlElement(name = "param", required=false, nillable=false)
|
||||||
@JsonProperty(value="param", required=true)
|
@JsonProperty(value="param", required=true)
|
||||||
private List<DataMinerParam> params;
|
private List<DataMinerParam> params;
|
||||||
|
|
||||||
|
|
|
@ -44,7 +44,7 @@ public class DataMinerParameters implements Serializable{
|
||||||
@XmlElement(name = "input", required=true, nillable=false)
|
@XmlElement(name = "input", required=true, nillable=false)
|
||||||
@JsonProperty(required=true)
|
@JsonProperty(required=true)
|
||||||
private DataMinerInputParams input;
|
private DataMinerInputParams input;
|
||||||
@XmlElement(name = "output", required=false, nillable=true)
|
@XmlElement(name = "output", required=false, nillable=false)
|
||||||
@JsonProperty(required=false)
|
@JsonProperty(required=false)
|
||||||
private DataMinerOutputParams output;
|
private DataMinerOutputParams output;
|
||||||
|
|
||||||
|
|
|
@ -67,7 +67,7 @@ public class DataMinerInvocationTest {
|
||||||
System.out.println(new String(outStreamXML.toByteArray()));
|
System.out.println(new String(outStreamXML.toByteArray()));
|
||||||
}
|
}
|
||||||
|
|
||||||
//@Test
|
@Test
|
||||||
public void unmarshallingXMLTest() throws JAXBException, IOException, SAXException{
|
public void unmarshallingXMLTest() throws JAXBException, IOException, SAXException{
|
||||||
System.out.println(DataMinerInvocationTest.class.getMethods()[1].getName()+" called");
|
System.out.println(DataMinerInvocationTest.class.getMethods()[1].getName()+" called");
|
||||||
FileInputStream dmInvocationXMLFile = new FileInputStream(new File("./src/test/resources/DataMinerInvocation.xml"));
|
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{
|
public void unmarshallingJSONTest() throws JAXBException, IOException, SAXException{
|
||||||
System.out.println(DataMinerInvocationTest.class.getMethods()[2].getName()+" called");
|
System.out.println(DataMinerInvocationTest.class.getMethods()[2].getName()+" called");
|
||||||
FileInputStream dmInvocationJSONFile = new FileInputStream(new File("./src/test/resources/DataMinerInvocation.json"));
|
FileInputStream dmInvocationJSONFile = new FileInputStream(new File("./src/test/resources/DataMinerInvocation.json"));
|
||||||
|
|
|
@ -1,17 +1,13 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<dataminer-invocation>
|
<dataminer-invocation>
|
||||||
<operator-id>org.gcube.dataanalysis.wps.statisticalmanager.synchserver.mappedclasses.transducerers.MPA_INTERSECT</operator-id>
|
<operator-id>org.gcube.dataanalysis.wps.statisticalmanager.synchserver.mappedclasses.transducerers.MPA_INTERSECT</operator-id>
|
||||||
<action>RUN</action>
|
<action>RUN</action>
|
||||||
<parameters>
|
<parameters>
|
||||||
<input>
|
<input>
|
||||||
<param>
|
<param>
|
||||||
<key>fileId</key>
|
<key>param2</key>
|
||||||
<value>http://publicLinkToFile</value>
|
<value>value2</value>
|
||||||
</param>
|
</param>
|
||||||
<param>
|
</input>
|
||||||
<key>param2</key>
|
</parameters>
|
||||||
<value>value2</value>
|
|
||||||
</param>
|
|
||||||
</input>
|
|
||||||
<output/>
|
|
||||||
</parameters>
|
|
||||||
</dataminer-invocation>
|
</dataminer-invocation>
|
Loading…
Reference in New Issue