From 8a4dd977892e503c237813c1f0a3558c93f384f5 Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Fri, 7 Dec 2018 16:18:02 +0000 Subject: [PATCH] added action field and output field as optional git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/data-analysis/dataminer-invocation-model@174676 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../model/DataMinerInvocation.java | 2 ++ .../model/DataMinerParameters.java | 2 ++ src/test/java/DataMinerInvocationTest.java | 17 +++++++++-- src/test/resources/DataMinerInvocation.json | 16 ++++++++++ src/test/resources/DataMinerInvocation.xml | 29 ++++++++++--------- 5 files changed, 49 insertions(+), 17 deletions(-) create mode 100644 src/test/resources/DataMinerInvocation.json 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 1a71a2a..2bfb1ed 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 @@ -9,6 +9,7 @@ import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlTransient; import lombok.AllArgsConstructor; import lombok.Getter; @@ -39,6 +40,7 @@ public class DataMinerInvocation implements Serializable{ private String operatorId; @XmlElement(name = "action") + @XmlTransient private ActionType actionType = ActionType.RUN; @XmlElement(name = "parameters") 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 88cc499..e2c96d5 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 @@ -9,6 +9,7 @@ import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlTransient; import lombok.AllArgsConstructor; import lombok.Getter; @@ -40,6 +41,7 @@ public class DataMinerParameters implements Serializable{ @XmlElement(name = "input") private DataMinerInputParams input; @XmlElement(name = "output") + @XmlTransient private DataMinerOutputParams output; } diff --git a/src/test/java/DataMinerInvocationTest.java b/src/test/java/DataMinerInvocationTest.java index 4c1e2e7..f938e43 100644 --- a/src/test/java/DataMinerInvocationTest.java +++ b/src/test/java/DataMinerInvocationTest.java @@ -22,7 +22,6 @@ import org.gcube.data.analysis.dminvocation.model.DataMinerOutputParams; import org.gcube.data.analysis.dminvocation.model.DataMinerParam; import org.gcube.data.analysis.dminvocation.model.DataMinerParameters; import org.junit.Before; -import org.junit.Test; /** @@ -44,7 +43,7 @@ public class DataMinerInvocationTest { } - @Test + //@Test public void marshallingTest() throws JAXBException { //LOADING PARAMETERS @@ -69,10 +68,22 @@ public class DataMinerInvocationTest { System.out.println(new String(outStreamXML.toByteArray())); } - @Test + //@Test public void unmarshallingXMLTest() throws JAXBException, FileNotFoundException{ FileInputStream dmInvocationXMLFile = new FileInputStream(new File("./src/test/resources/DataMinerInvocation.xml")); DataMinerInvocation dmInvocation = DataMinerInvocationManager.unmarshaling(dmInvocationXMLFile, MediaType.ApplicationXML); System.out.println(dmInvocation); + + ByteArrayOutputStream outStreamJSON = DataMinerInvocationManager.marshaling(dmInvocation, MediaType.ApplicationJSON); + System.out.println(new String(outStreamJSON.toByteArray())); + + } + + //@Test + public void unmarshallingJSONTest() throws JAXBException, FileNotFoundException{ + FileInputStream dmInvocationXMLFile = new FileInputStream(new File("./src/test/resources/DataMinerInvocation.json")); + DataMinerInvocation dmInvocation = DataMinerInvocationManager.unmarshaling(dmInvocationXMLFile, MediaType.ApplicationJSON); + System.out.println(dmInvocation); + } } diff --git a/src/test/resources/DataMinerInvocation.json b/src/test/resources/DataMinerInvocation.json new file mode 100644 index 0000000..28deac5 --- /dev/null +++ b/src/test/resources/DataMinerInvocation.json @@ -0,0 +1,16 @@ +{ + "dataminer-invocation" : { + "operator-id" : "org.gcube.dataanalysis.wps.statisticalmanager.synchserver.mappedclasses.transducerers.MPA_INTERSECT", + "parameters" : { + "input" : { + "param" : [ { + "key" : "fileId", + "value" : "http://publicLinkToFile" + }, { + "key" : "param2", + "value" : "value2" + } ] + } + } + } +} \ No newline at end of file diff --git a/src/test/resources/DataMinerInvocation.xml b/src/test/resources/DataMinerInvocation.xml index fc061c3..15d7a53 100644 --- a/src/test/resources/DataMinerInvocation.xml +++ b/src/test/resources/DataMinerInvocation.xml @@ -1,16 +1,17 @@ - THE_OPERATOR_ID - - - - key1 - value1 - - - key2 - value2 - - - - + org.gcube.dataanalysis.wps.statisticalmanager.synchserver.mappedclasses.transducerers.MPA_INTERSECT + RUN + + + + fileId + http://publicLinkToFile + + + param2 + value2 + + + + \ No newline at end of file