From d411cc700d52821abe7d68f5e22f1f9726e47c24 Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Fri, 7 Dec 2018 16:34:27 +0000 Subject: [PATCH] added "parameters" as optional field git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/data-analysis/dataminer-invocation-model@174677 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../data/analysis/dminvocation/model/DataMinerInvocation.java | 2 +- src/test/java/DataMinerInvocationTest.java | 3 ++- 2 files changed, 3 insertions(+), 2 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 2bfb1ed..d7dd7e6 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 @@ -43,7 +43,7 @@ public class DataMinerInvocation implements Serializable{ @XmlTransient private ActionType actionType = ActionType.RUN; - @XmlElement(name = "parameters") + @XmlTransient private DataMinerParameters parameters; } diff --git a/src/test/java/DataMinerInvocationTest.java b/src/test/java/DataMinerInvocationTest.java index f938e43..74bc1b2 100644 --- a/src/test/java/DataMinerInvocationTest.java +++ b/src/test/java/DataMinerInvocationTest.java @@ -22,6 +22,7 @@ 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; /** @@ -79,7 +80,7 @@ public class DataMinerInvocationTest { } - //@Test + @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);