diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/monitor/BackgroundOperationMonitorCreator.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/monitor/BackgroundOperationMonitorCreator.java index 799538a..ef28435 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/monitor/BackgroundOperationMonitorCreator.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/monitor/BackgroundOperationMonitorCreator.java @@ -39,7 +39,6 @@ import org.gcube.portlets.user.td.gwtservice.shared.task.JobSClassifier; import org.gcube.portlets.user.td.gwtservice.shared.task.TaskS; import org.gcube.portlets.user.td.gwtservice.shared.task.TaskWrapper; import org.gcube.portlets.user.td.gwtservice.shared.task.ValidationsJobS; -import org.gcube.portlets.user.td.gwtservice.shared.tr.table.metadata.TabExportMetadata; import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -56,8 +55,8 @@ public class BackgroundOperationMonitorCreator { private static Logger logger = LoggerFactory .getLogger(BackgroundOperationMonitorCreator.class); - private static SimpleDateFormat sdf = new SimpleDateFormat( - "yyyy-MM-dd HH:mm"); + //private static SimpleDateFormat sdf = new SimpleDateFormat( + // "yyyy-MM-dd HH:mm"); @SuppressWarnings("unused") private static SimpleDateFormat sdfDate = new SimpleDateFormat("yyyy-MM-dd"); @@ -281,13 +280,13 @@ public class BackgroundOperationMonitorCreator { operationMonitor.setTrId(SessionUtil.getTRId(session)); - TabExportMetadata trExportMetadata; + /*TabExportMetadata trExportMetadata; trExportMetadata = new TabExportMetadata(); trExportMetadata.setUrl(exportMetadata.getUri()); trExportMetadata.setDestinationType(exportMetadata .getDestinationType()); trExportMetadata.setExportDate(sdf.format(exportMetadata - .getExportDate())); + .getExportDate()));*/ saveCSVExportInDestination(exportMetadata); break; @@ -306,12 +305,12 @@ public class BackgroundOperationMonitorCreator { operationMonitor.setTrId(SessionUtil.getTRId(session)); - trExportMetadata = new TabExportMetadata(); + /*trExportMetadata = new TabExportMetadata(); trExportMetadata.setUrl(exportMetadata.getUri()); trExportMetadata.setDestinationType(exportMetadata .getDestinationType()); trExportMetadata.setExportDate(sdf.format(exportMetadata - .getExportDate())); + .getExportDate()));*/ saveJSONExportInDestination(exportMetadata); break; diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/monitor/OperationMonitorCreator.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/monitor/OperationMonitorCreator.java index 30d3158..fa52e24 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/monitor/OperationMonitorCreator.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/monitor/OperationMonitorCreator.java @@ -39,7 +39,6 @@ import org.gcube.portlets.user.td.gwtservice.shared.task.TaskS; import org.gcube.portlets.user.td.gwtservice.shared.task.TaskWrapper; import org.gcube.portlets.user.td.gwtservice.shared.task.ValidationsJobS; import org.gcube.portlets.user.td.gwtservice.shared.tr.TabResource; -import org.gcube.portlets.user.td.gwtservice.shared.tr.table.metadata.TabExportMetadata; import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -56,8 +55,8 @@ public class OperationMonitorCreator { private static Logger logger = LoggerFactory .getLogger(OperationMonitorCreator.class); - private static SimpleDateFormat sdf = new SimpleDateFormat( - "yyyy-MM-dd HH:mm"); + //private static SimpleDateFormat sdf = new SimpleDateFormat( + // "yyyy-MM-dd HH:mm"); @SuppressWarnings("unused") private static SimpleDateFormat sdfDate = new SimpleDateFormat("yyyy-MM-dd"); @@ -262,7 +261,7 @@ public class OperationMonitorCreator { TRId trId; TabResource tabResource; Table table; - TabExportMetadata trExportMetadata; + //TabExportMetadata trExportMetadata; ExportMetadata exportMetadata; switch (taskWrapper.getOperationId()) { @@ -274,12 +273,12 @@ public class OperationMonitorCreator { operationMonitor.setTrId(SessionUtil.getTRId(session)); - trExportMetadata = new TabExportMetadata(); + /*trExportMetadata = new TabExportMetadata(); trExportMetadata.setUrl(exportMetadata.getUri()); trExportMetadata.setDestinationType(exportMetadata .getDestinationType()); trExportMetadata.setExportDate(sdf.format(exportMetadata - .getExportDate())); + .getExportDate()));*/ saveCSVExportInDestination(exportMetadata); break; @@ -298,12 +297,12 @@ public class OperationMonitorCreator { operationMonitor.setTrId(SessionUtil.getTRId(session)); - trExportMetadata = new TabExportMetadata(); + /*trExportMetadata = new TabExportMetadata(); trExportMetadata.setUrl(exportMetadata.getUri()); trExportMetadata.setDestinationType(exportMetadata .getDestinationType()); trExportMetadata.setExportDate(sdf.format(exportMetadata - .getExportDate())); + .getExportDate()));*/ saveJSONExportInDestination(exportMetadata); break;