diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index cfa6374..6952109 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -4,6 +4,9 @@ + + uses + diff --git a/src/main/java/org/gcube/datatransfer/resolver/services/AnalyticsCreateResolver.java b/src/main/java/org/gcube/datatransfer/resolver/services/AnalyticsCreateResolver.java index d3f64b1..9ec4a95 100644 --- a/src/main/java/org/gcube/datatransfer/resolver/services/AnalyticsCreateResolver.java +++ b/src/main/java/org/gcube/datatransfer/resolver/services/AnalyticsCreateResolver.java @@ -7,7 +7,6 @@ import static org.gcube.common.authorization.client.Constants.authorizationServi import static org.gcube.resources.discovery.icclient.ICFactory.clientFor; import static org.gcube.resources.discovery.icclient.ICFactory.queryFor; -import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FileInputStream; import java.io.IOException; @@ -99,7 +98,7 @@ public class AnalyticsCreateResolver { DataMinerInvocation jsonRequest = null; try { - jsonRequest = DataMinerInvocationManager.getInstance().unmarshaling(IOUtils.toInputStream(body), org.gcube.data.analysis.dminvocation.MediaType.ApplicationJSON, true); + jsonRequest = DataMinerInvocationManager.getInstance().unmarshalingJSON(IOUtils.toInputStream(body), true); } catch (IOException | JAXBException | SAXException e1) { logger.error("The body is not a valid DataMinerInvocation JSON request",e1); @@ -147,9 +146,9 @@ public class AnalyticsCreateResolver { File tempInvocationFile = null; try { - ByteArrayOutputStream xmlByteArray = DataMinerInvocationManager.getInstance().marshaling(jsonRequest, org.gcube.data.analysis.dminvocation.MediaType.ApplicationXML, true); + String xmlRequest = DataMinerInvocationManager.getInstance().marshalingXML(jsonRequest, true, true); String uniqueName = createDMInvocationFileName(jsonRequest.getOperatorId()); - tempInvocationFile = createTempFile(uniqueName, ".xml", xmlByteArray.toByteArray()); + tempInvocationFile = createTempFile(uniqueName, ".xml", xmlRequest.getBytes()); logger.info("Created StorageHubClient Instance, uploading file: "+tempInvocationFile.getName()); AuthorizationEntry entry = authorizationService().get(contextToken); @@ -338,10 +337,10 @@ public class AnalyticsCreateResolver { } - public static void main(String[] args) { - - System.out.println(readApplicationTokenFromSE(null, "/gcube")); - - } +// public static void main(String[] args) { +// +// System.out.println(readApplicationTokenFromSE(null, "/gcube")); +// +// } }