From 47608e80de6f4ee1a30be0488ca26bf4819f2a01 Mon Sep 17 00:00:00 2001
From: Giancarlo Panichi
Date: Tue, 1 Oct 2019 09:49:02 +0000
Subject: [PATCH] ref 11711: SAI - Add a simple text viewer so that log files
created by Data Miner algorithms can be directly viewed in the browser
https://support.d4science.org/issues/11711
Added service info[ticket #12594]
Added support to show log information [ticket #11711]
Added support to show files html, json, pdf, txt [ticket #17106]
Updated information show to the user when a computation is submitted [ticket #17030]
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/data-miner-executor@181884 82a268e6-3cf1-43bd-a215-b396298e98cf
---
distro/changelog.xml | 11 +
.../client/DataMinerExecutorController.java | 49 +++-
.../client/events/ServiceInfoEvent.java | 62 +++++
.../events/ServiceInfoRequestEvent.java | 56 +++++
.../experiments/ComputationStatusPanel.java | 39 ++-
.../LinkToMonitorComputationDialog.java | 48 ++++
.../client/experiments/WorkflowPanel.java | 56 ++---
.../info/ServiceInfoDataProperties.java | 24 ++
.../client/info/ServiceInfoPanel.java | 227 ++++++++++++++++++
.../client/resources/Resources.java | 3 +
.../client/resources/page-white.png | Bin 0 -> 293 bytes
.../client/rpc/DataMinerExecutorService.java | 2 +
.../rpc/DataMinerExecutorServiceAsync.java | 4 +-
.../client/widgets/FileViewer.java | 67 +++++-
.../client/widgets/ShowFileDialog.java | 82 +++++++
.../server/DataMinerExecutorServiceImpl.java | 22 ++
.../TestDataMinerService.java | 118 +++++----
.../TestInformationSystemRequests.java | 100 ++++++++
18 files changed, 853 insertions(+), 117 deletions(-)
create mode 100644 src/main/java/org/gcube/portlets/user/dataminerexecutor/client/events/ServiceInfoEvent.java
create mode 100644 src/main/java/org/gcube/portlets/user/dataminerexecutor/client/events/ServiceInfoRequestEvent.java
create mode 100644 src/main/java/org/gcube/portlets/user/dataminerexecutor/client/experiments/LinkToMonitorComputationDialog.java
create mode 100644 src/main/java/org/gcube/portlets/user/dataminerexecutor/client/info/ServiceInfoDataProperties.java
create mode 100644 src/main/java/org/gcube/portlets/user/dataminerexecutor/client/info/ServiceInfoPanel.java
create mode 100644 src/main/java/org/gcube/portlets/user/dataminerexecutor/client/resources/page-white.png
create mode 100644 src/main/java/org/gcube/portlets/user/dataminerexecutor/client/widgets/ShowFileDialog.java
create mode 100644 src/test/java/org/gcube/portlets/user/dataminerexecutor/TestInformationSystemRequests.java
diff --git a/distro/changelog.xml b/distro/changelog.xml
index 8b7b1b8..08fef4e 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -1,4 +1,15 @@
+
+ Added service info [ticket #12594]
+ Added support to show log information [ticket #11711]
+ Added support to show files html, json, pdf, txt [ticket
+ #17106]
+
+ Updated information show to the user when a computation is
+ submitted [ticket #17030]
+
+ Added Item Id support [ticket #16503]
+
Added automatic run [ticket #16155]
diff --git a/src/main/java/org/gcube/portlets/user/dataminerexecutor/client/DataMinerExecutorController.java b/src/main/java/org/gcube/portlets/user/dataminerexecutor/client/DataMinerExecutorController.java
index ad1a375..75a1d91 100644
--- a/src/main/java/org/gcube/portlets/user/dataminerexecutor/client/DataMinerExecutorController.java
+++ b/src/main/java/org/gcube/portlets/user/dataminerexecutor/client/DataMinerExecutorController.java
@@ -3,6 +3,7 @@ package org.gcube.portlets.user.dataminerexecutor.client;
import org.gcube.data.analysis.dataminermanagercl.shared.data.OutputData;
import org.gcube.data.analysis.dataminermanagercl.shared.data.computations.ComputationData;
import org.gcube.data.analysis.dataminermanagercl.shared.data.computations.ComputationId;
+import org.gcube.data.analysis.dataminermanagercl.shared.service.ServiceInfo;
import org.gcube.data.analysis.dataminermanagercl.shared.workspace.ItemDescription;
import org.gcube.portlets.user.dataminerexecutor.client.common.EventBusProvider;
import org.gcube.portlets.user.dataminerexecutor.client.events.CancelComputationExecutionRequestEvent;
@@ -18,6 +19,8 @@ import org.gcube.portlets.user.dataminerexecutor.client.events.OutputDataEvent;
import org.gcube.portlets.user.dataminerexecutor.client.events.OutputDataRequestEvent;
import org.gcube.portlets.user.dataminerexecutor.client.events.ResubmitComputationExecutionEvent;
import org.gcube.portlets.user.dataminerexecutor.client.events.ResubmitComputationExecutionRequestEvent;
+import org.gcube.portlets.user.dataminerexecutor.client.events.ServiceInfoEvent;
+import org.gcube.portlets.user.dataminerexecutor.client.events.ServiceInfoRequestEvent;
import org.gcube.portlets.user.dataminerexecutor.client.events.SessionExpiredEvent;
import org.gcube.portlets.user.dataminerexecutor.client.events.StartComputationExecutionEvent;
import org.gcube.portlets.user.dataminerexecutor.client.events.StartComputationExecutionRequestEvent;
@@ -198,6 +201,17 @@ public class DataMinerExecutorController {
});
+ EventBusProvider.INSTANCE.addHandler(ServiceInfoRequestEvent.TYPE,
+ new ServiceInfoRequestEvent.ServiceInfoRequestEventHandler() {
+
+ @Override
+ public void onRequest(ServiceInfoRequestEvent event) {
+ Log.debug("Catch EnvironmentRequestEvent: " + event);
+ retrieveEnvironment(event);
+
+ }
+ });
+
}
private void restoreUISession() {
@@ -371,7 +385,8 @@ public class DataMinerExecutorController {
private void getDataMinerInvocationModelRequest() {
if (invocationModelFileUrl == null || invocationModelFileUrl.isEmpty()) {
- Log.error("Invalid request, the invocation model has not been specified correctly: " + invocationModelFileUrl);
+ Log.error("Invalid request, the invocation model has not been specified correctly: "
+ + invocationModelFileUrl);
UtilsGXT3.alert("Error", "Invalid request, the invocation model has not been specified correctly!");
} else {
final AutoProgressMessageBox messageBox = new AutoProgressMessageBox("Retrieve Info",
@@ -394,8 +409,9 @@ public class DataMinerExecutorController {
"The VRE currently has problems loading the required operator using the invocation model specified!");
Log.error(
"The VRE currently has problems loading the required operator using the invocation model specified: "
- + caught.getLocalizedMessage(),caught);
-
+ + caught.getLocalizedMessage(),
+ caught);
+
}
}
@@ -486,5 +502,32 @@ public class DataMinerExecutorController {
EventBusProvider.INSTANCE.fireEvent(event);
}
+
+ private void retrieveEnvironment(final ServiceInfoRequestEvent event) {
+ DataMinerExecutorServiceAsync.INSTANCE.getServiceInfo(new AsyncCallback() {
+
+ @Override
+ public void onFailure(Throwable caught) {
+ if (caught instanceof SessionExpiredServiceException) {
+ UtilsGXT3.alert("Error", "Expired Session");
+ EventBusProvider.INSTANCE.fireEvent(new SessionExpiredEvent());
+ } else {
+ UtilsGXT3.alert("Error",
+ "Error retrieving DataMiner service info: " + caught.getLocalizedMessage());
+ }
+ }
+
+ @Override
+ public void onSuccess(ServiceInfo serviceInfo) {
+ Log.debug("DataMiner Service Info: " + serviceInfo);
+
+ ServiceInfoEvent serviceInfoEvent = new ServiceInfoEvent(serviceInfo);
+ EventBusProvider.INSTANCE.fireEvent(serviceInfoEvent);
+
+ }
+
+ });
+
+ }
}
\ No newline at end of file
diff --git a/src/main/java/org/gcube/portlets/user/dataminerexecutor/client/events/ServiceInfoEvent.java b/src/main/java/org/gcube/portlets/user/dataminerexecutor/client/events/ServiceInfoEvent.java
new file mode 100644
index 0000000..9fa24c0
--- /dev/null
+++ b/src/main/java/org/gcube/portlets/user/dataminerexecutor/client/events/ServiceInfoEvent.java
@@ -0,0 +1,62 @@
+package org.gcube.portlets.user.dataminerexecutor.client.events;
+
+import org.gcube.data.analysis.dataminermanagercl.shared.service.ServiceInfo;
+
+import com.google.gwt.event.shared.EventHandler;
+import com.google.gwt.event.shared.GwtEvent;
+import com.google.gwt.event.shared.HandlerRegistration;
+import com.google.gwt.event.shared.HasHandlers;
+
+/**
+ * Service Info Event
+ *
+ *
+ * @author Giancarlo Panichi
+ *
+ *
+ */
+public class ServiceInfoEvent extends GwtEvent {
+
+ public static Type TYPE = new Type();
+ private ServiceInfo serviceInfo;
+
+ public interface ServiceInfoEventHandler extends EventHandler {
+ void onRequest(ServiceInfoEvent event);
+ }
+
+ public interface HasServiceInfoEventHandler extends HasHandlers {
+ public HandlerRegistration addServiceInfoEventHandler(ServiceInfoEventHandler handler);
+ }
+
+ public ServiceInfoEvent(ServiceInfo serviceInfo) {
+ this.serviceInfo = serviceInfo;
+ }
+
+ @Override
+ protected void dispatch(ServiceInfoEventHandler handler) {
+ handler.onRequest(this);
+ }
+
+ @Override
+ public Type getAssociatedType() {
+ return TYPE;
+ }
+
+ public static Type getType() {
+ return TYPE;
+ }
+
+ public static void fire(HasHandlers source, ServiceInfoEvent event) {
+ source.fireEvent(event);
+ }
+
+ public ServiceInfo getServiceInfo() {
+ return serviceInfo;
+ }
+
+ @Override
+ public String toString() {
+ return "ServiceInfoEvent [serviceInfo=" + serviceInfo + "]";
+ }
+
+}
diff --git a/src/main/java/org/gcube/portlets/user/dataminerexecutor/client/events/ServiceInfoRequestEvent.java b/src/main/java/org/gcube/portlets/user/dataminerexecutor/client/events/ServiceInfoRequestEvent.java
new file mode 100644
index 0000000..b4122c7
--- /dev/null
+++ b/src/main/java/org/gcube/portlets/user/dataminerexecutor/client/events/ServiceInfoRequestEvent.java
@@ -0,0 +1,56 @@
+package org.gcube.portlets.user.dataminerexecutor.client.events;
+
+import com.google.gwt.event.shared.EventHandler;
+import com.google.gwt.event.shared.GwtEvent;
+import com.google.gwt.event.shared.HandlerRegistration;
+import com.google.gwt.event.shared.HasHandlers;
+
+/**
+ * Service Info Request Event
+ *
+ *
+ * @author Giancarlo Panichi
+ *
+ *
+ */
+public class ServiceInfoRequestEvent extends GwtEvent {
+
+ public static Type TYPE = new Type();
+
+ public interface ServiceInfoRequestEventHandler extends EventHandler {
+ void onRequest(ServiceInfoRequestEvent event);
+ }
+
+ public interface HasServiceInfoRequestEventHandler extends HasHandlers {
+ public HandlerRegistration addServiceInfoRequestEventHandler(ServiceInfoRequestEventHandler handler);
+ }
+
+ public ServiceInfoRequestEvent() {
+
+ }
+
+ @Override
+ protected void dispatch(ServiceInfoRequestEventHandler handler) {
+ handler.onRequest(this);
+ }
+
+ @Override
+ public Type getAssociatedType() {
+ return TYPE;
+ }
+
+ public static Type getType() {
+ return TYPE;
+ }
+
+ public static void fire(HasHandlers source, ServiceInfoRequestEvent event) {
+ source.fireEvent(event);
+ }
+
+ @Override
+ public String toString() {
+ return "ServiceInfoRequestEvent []";
+ }
+
+
+}
diff --git a/src/main/java/org/gcube/portlets/user/dataminerexecutor/client/experiments/ComputationStatusPanel.java b/src/main/java/org/gcube/portlets/user/dataminerexecutor/client/experiments/ComputationStatusPanel.java
index 9a6aea1..1fb4173 100644
--- a/src/main/java/org/gcube/portlets/user/dataminerexecutor/client/experiments/ComputationStatusPanel.java
+++ b/src/main/java/org/gcube/portlets/user/dataminerexecutor/client/experiments/ComputationStatusPanel.java
@@ -86,13 +86,8 @@ public class ComputationStatusPanel extends SimpleContainer {
*/
// vert.add(date, new VerticalLayoutData(-1, -1, new Margins(0)));
- vert.add(new HtmlLayoutContainer("Created, the id is " + computationId.getId() + "
"));
-
- String opName=computationId.getOperatorName();
- opName=opName.replaceAll("\\s+", "_");
-
- vert.add(new HtmlLayoutContainer("DataMiner>Computations>"
- + opName.toUpperCase() + "_ID_" + computationId.getId() + "
"));
+ vert.add(new HtmlLayoutContainer(
+ "Id: " + computationId.getId() + "
"));
TextButton equivalentRequestBtn = new TextButton();
equivalentRequestBtn.setText("Show");
@@ -103,13 +98,27 @@ public class ComputationStatusPanel extends SimpleContainer {
showEquivalentRequestDialog();
}
-
});
- FieldLabel equivalentRequestLabel = new FieldLabel(equivalentRequestBtn, "Equivalent Get Request");
- equivalentRequestLabel.setLabelWidth(140);
- // vert.add(equivalentRequestLabel, new VerticalLayoutData(-1, -1,
- // new Margins(0)));
+ FieldLabel equivalentRequestLabel = new FieldLabel(equivalentRequestBtn, "WPS Request");
+ equivalentRequestLabel.setLabelWidth(180);
+ vert.add(equivalentRequestLabel, new VerticalLayoutData(-1, -1, new Margins(0)));
+
+ TextButton monitorComputationBtn = new TextButton();
+ monitorComputationBtn.setText("Show");
+ monitorComputationBtn.addSelectHandler(new SelectHandler() {
+
+ @Override
+ public void onSelect(SelectEvent event) {
+ showLinkToMonitorComputationDialog();
+
+
+ }
+ });
+
+ FieldLabel monitorComputationLabel = new FieldLabel(monitorComputationBtn, "Link to monitor the computation");
+ monitorComputationLabel.setLabelWidth(180);
+ vert.add(monitorComputationLabel, new VerticalLayoutData(-1, -1, new Margins(0)));
progressBar = new ProgressBar();
progressBar.updateProgress(0, "Starting...");
@@ -139,6 +148,12 @@ public class ComputationStatusPanel extends SimpleContainer {
equivalentRequestDialog.show();
}
+ private void showLinkToMonitorComputationDialog() {
+ LinkToMonitorComputationDialog linkToMonitorComputDialogDialog = new LinkToMonitorComputationDialog(
+ computationId);
+ linkToMonitorComputDialogDialog.show();
+ }
+
private void cancelComputation() {
CancelComputationExecutionRequestEvent event = new CancelComputationExecutionRequestEvent(computationId);
EventBusProvider.INSTANCE.fireEvent(event);
diff --git a/src/main/java/org/gcube/portlets/user/dataminerexecutor/client/experiments/LinkToMonitorComputationDialog.java b/src/main/java/org/gcube/portlets/user/dataminerexecutor/client/experiments/LinkToMonitorComputationDialog.java
new file mode 100644
index 0000000..f364d85
--- /dev/null
+++ b/src/main/java/org/gcube/portlets/user/dataminerexecutor/client/experiments/LinkToMonitorComputationDialog.java
@@ -0,0 +1,48 @@
+package org.gcube.portlets.user.dataminerexecutor.client.experiments;
+
+import org.gcube.data.analysis.dataminermanagercl.shared.data.computations.ComputationId;
+
+import com.allen_sauer.gwt.log.client.Log;
+import com.sencha.gxt.widget.core.client.Dialog;
+import com.sencha.gxt.widget.core.client.container.BoxLayoutContainer.BoxLayoutPack;
+import com.sencha.gxt.widget.core.client.form.TextArea;
+
+/**
+ *
+ * @author Giancarlo Panichi
+ *
+ *
+ */
+public class LinkToMonitorComputationDialog extends Dialog {
+ private ComputationId computationId;
+
+ public LinkToMonitorComputationDialog(ComputationId computationId) {
+ super();
+ Log.debug("LinkToMonitorComputationDialog: " + computationId);
+ this.computationId = computationId;
+ init();
+ create();
+ }
+
+ private void init() {
+ setModal(true);
+ setClosable(true);
+ setHeadingText("Link To Monitor The Computation");
+ setBodyBorder(true);
+ setHideOnButtonClick(true);
+ setPredefinedButtons(PredefinedButton.CLOSE);
+ getButtonBar().setPack(BoxLayoutPack.CENTER);
+ }
+
+ private void create() {
+ TextArea infoArea = new TextArea();
+ infoArea.setHeight(200);
+ infoArea.setWidth(640);
+ infoArea.setValue(computationId.getUrlId());
+ infoArea.setReadOnly(true);
+ add(infoArea);
+
+
+ }
+
+}
diff --git a/src/main/java/org/gcube/portlets/user/dataminerexecutor/client/experiments/WorkflowPanel.java b/src/main/java/org/gcube/portlets/user/dataminerexecutor/client/experiments/WorkflowPanel.java
index 86c15f7..7ba4f7a 100644
--- a/src/main/java/org/gcube/portlets/user/dataminerexecutor/client/experiments/WorkflowPanel.java
+++ b/src/main/java/org/gcube/portlets/user/dataminerexecutor/client/experiments/WorkflowPanel.java
@@ -8,6 +8,7 @@ import org.gcube.portlets.user.dataminerexecutor.client.DataMinerExecutor;
import org.gcube.portlets.user.dataminerexecutor.client.common.EventBusProvider;
import org.gcube.portlets.user.dataminerexecutor.client.events.ComputationReadyEvent;
import org.gcube.portlets.user.dataminerexecutor.client.events.ResubmitComputationExecutionEvent;
+import org.gcube.portlets.user.dataminerexecutor.client.info.ServiceInfoPanel;
import org.gcube.portlets.user.dataminerexecutor.shared.process.InvocationModel;
import com.allen_sauer.gwt.log.client.Log;
@@ -21,11 +22,13 @@ import com.sencha.gxt.widget.core.client.TabPanel;
*
*/
public class WorkflowPanel extends TabPanel {
-
- public static final String DEFAULT_OPERATOR = "AQUAMAPS_SUITABLE";
+ private static final String OPERATOR = "Operator";
+ private static final String COMPUTATIONS_EXECUTION = "Computations Execution";
+ private static final String SERVICE_INFO = "Service Profile";
private ComputationExecutionPanel computationExecutionPanel;
private ComputationPanel computationPanel;
+ private ServiceInfoPanel environmentPanel;
/**
*
@@ -44,30 +47,30 @@ public class WorkflowPanel extends TabPanel {
private void create() {
- TabItemConfig tabWorkFlowLcItemConf = new TabItemConfig("Operator",
- false);
- tabWorkFlowLcItemConf.setIcon(DataMinerExecutor.resources
- .folderExplore());
+ TabItemConfig tabWorkFlowLcItemConf = new TabItemConfig(OPERATOR, false);
+ tabWorkFlowLcItemConf.setIcon(DataMinerExecutor.resources.folderExplore());
computationPanel = new ComputationPanel();
- computationPanel
- .addComputationReadyEventHandler(new ComputationReadyEvent.ComputationReadyEventHandler() {
+ computationPanel.addComputationReadyEventHandler(new ComputationReadyEvent.ComputationReadyEventHandler() {
- @Override
- public void onReady(ComputationReadyEvent event) {
- Log.debug("StartComputationEvent Received:" + event);
- startComputation(event.getOperator());
+ @Override
+ public void onReady(ComputationReadyEvent event) {
+ Log.debug("StartComputationEvent Received:" + event);
+ startComputation(event.getOperator());
- }
- });
+ }
+ });
add(computationPanel, tabWorkFlowLcItemConf);
- TabItemConfig tabComputationPanelItemConf = new TabItemConfig(
- "Computations Execution", false);
- tabComputationPanelItemConf.setIcon(DataMinerExecutor.resources
- .folderExplore());
+ TabItemConfig tabComputationPanelItemConf = new TabItemConfig(COMPUTATIONS_EXECUTION, false);
+ tabComputationPanelItemConf.setIcon(DataMinerExecutor.resources.folderExplore());
computationExecutionPanel = new ComputationExecutionPanel();
add(computationExecutionPanel, tabComputationPanelItemConf);
+ TabItemConfig tabEnvironmentPanelItemConf = new TabItemConfig(SERVICE_INFO, false);
+ tabEnvironmentPanelItemConf.setIcon(DataMinerExecutor.resources.folderExplore());
+ environmentPanel = new ServiceInfoPanel();
+ add(environmentPanel, tabEnvironmentPanelItemConf);
+
setActiveWidget(computationPanel);
}
@@ -75,16 +78,13 @@ public class WorkflowPanel extends TabPanel {
*
*/
private void bind() {
- EventBusProvider.INSTANCE
- .addHandler(
- ResubmitComputationExecutionEvent.getType(),
- new ResubmitComputationExecutionEvent.ResubmitComputationExecutionEventHandler() {
- @Override
- public void onResubmit(
- ResubmitComputationExecutionEvent event) {
- resubmitComputation();
- }
- });
+ EventBusProvider.INSTANCE.addHandler(ResubmitComputationExecutionEvent.getType(),
+ new ResubmitComputationExecutionEvent.ResubmitComputationExecutionEventHandler() {
+ @Override
+ public void onResubmit(ResubmitComputationExecutionEvent event) {
+ resubmitComputation();
+ }
+ });
}
/**
diff --git a/src/main/java/org/gcube/portlets/user/dataminerexecutor/client/info/ServiceInfoDataProperties.java b/src/main/java/org/gcube/portlets/user/dataminerexecutor/client/info/ServiceInfoDataProperties.java
new file mode 100644
index 0000000..58f9497
--- /dev/null
+++ b/src/main/java/org/gcube/portlets/user/dataminerexecutor/client/info/ServiceInfoDataProperties.java
@@ -0,0 +1,24 @@
+package org.gcube.portlets.user.dataminerexecutor.client.info;
+
+import org.gcube.data.analysis.dataminermanagercl.shared.service.ServiceInfoData;
+
+import com.google.gwt.editor.client.Editor.Path;
+import com.sencha.gxt.core.client.ValueProvider;
+import com.sencha.gxt.data.shared.ModelKeyProvider;
+import com.sencha.gxt.data.shared.PropertyAccess;
+
+/**
+ *
+ * @author Giancarlo Panichi
+ *
+ *
+ */
+public interface ServiceInfoDataProperties extends PropertyAccess {
+ @Path("key")
+ ModelKeyProvider id();
+
+ ValueProvider key();
+ ValueProvider value();
+ ValueProvider category();
+}
+
diff --git a/src/main/java/org/gcube/portlets/user/dataminerexecutor/client/info/ServiceInfoPanel.java b/src/main/java/org/gcube/portlets/user/dataminerexecutor/client/info/ServiceInfoPanel.java
new file mode 100644
index 0000000..fe8b9ee
--- /dev/null
+++ b/src/main/java/org/gcube/portlets/user/dataminerexecutor/client/info/ServiceInfoPanel.java
@@ -0,0 +1,227 @@
+package org.gcube.portlets.user.dataminerexecutor.client.info;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.gcube.data.analysis.dataminermanagercl.shared.service.ServiceInfo;
+import org.gcube.data.analysis.dataminermanagercl.shared.service.ServiceInfoData;
+import org.gcube.portlets.user.dataminerexecutor.client.common.EventBusProvider;
+import org.gcube.portlets.user.dataminerexecutor.client.events.ServiceInfoEvent;
+import org.gcube.portlets.user.dataminerexecutor.client.events.ServiceInfoRequestEvent;
+
+import com.allen_sauer.gwt.log.client.Log;
+import com.google.gwt.core.client.GWT;
+import com.google.gwt.dom.client.Style.Unit;
+import com.sencha.gxt.core.client.dom.ScrollSupport.ScrollMode;
+import com.sencha.gxt.core.client.util.Margins;
+import com.sencha.gxt.data.shared.ListStore;
+import com.sencha.gxt.widget.core.client.FramedPanel;
+import com.sencha.gxt.widget.core.client.container.HtmlLayoutContainer;
+import com.sencha.gxt.widget.core.client.container.MarginData;
+import com.sencha.gxt.widget.core.client.container.SimpleContainer;
+import com.sencha.gxt.widget.core.client.container.VerticalLayoutContainer;
+import com.sencha.gxt.widget.core.client.container.VerticalLayoutContainer.VerticalLayoutData;
+import com.sencha.gxt.widget.core.client.form.FieldSet;
+import com.sencha.gxt.widget.core.client.grid.ColumnConfig;
+import com.sencha.gxt.widget.core.client.grid.ColumnModel;
+import com.sencha.gxt.widget.core.client.grid.Grid;
+import com.sencha.gxt.widget.core.client.grid.GroupingView;
+
+/**
+ *
+ * @author Giancarlo Panichi
+ *
+ *
+ */
+public class ServiceInfoPanel extends FramedPanel {
+
+ private static final String RUNTIME_FEATURE = "Runtime features";
+ private static final String SERVICE_INFO_TITLE = "Service Profile";
+ private static final ServiceInfoDataProperties props = GWT.create(ServiceInfoDataProperties.class);
+ private VerticalLayoutContainer v;
+ private VerticalLayoutContainer environmentVBox;
+
+ public ServiceInfoPanel() {
+ super();
+ Log.debug("ServiceInfoPanel");
+ init();
+ create();
+ bind();
+ EventBusProvider.INSTANCE.fireEvent(new ServiceInfoRequestEvent());
+
+ }
+
+ private void init() {
+ setItemId("ServiceInfoPanel");
+ forceLayoutOnResize = true;
+ setBodyBorder(false);
+ setBorders(false);
+ setBodyStyle("backgroundColor:white;");
+ setHeaderVisible(false);
+ setResize(true);
+ setHeadingText(SERVICE_INFO_TITLE);
+ setBodyStyle("backgroundColor:white;");
+
+ }
+
+ private void create() {
+ try {
+ v = new VerticalLayoutContainer();
+ v.setScrollMode(ScrollMode.AUTO);
+ add(v);
+ createView();
+ forceLayout();
+ } catch (Throwable e) {
+ Log.error("Error creating ServiceInfoPanel: " + e.getLocalizedMessage(), e);
+ }
+ }
+
+ private void bind() {
+
+ EventBusProvider.INSTANCE.addHandler(ServiceInfoEvent.TYPE, new ServiceInfoEvent.ServiceInfoEventHandler() {
+
+ @Override
+ public void onRequest(ServiceInfoEvent event) {
+ Log.debug("Catch ServiceInfoEvent");
+ showServiceInfo(event.getServiceInfo());
+
+ }
+
+ });
+
+ }
+
+ private void createView() {
+
+ SimpleContainer sectionTitle = new SimpleContainer();
+ SimpleContainer sectionSubTitle = new SimpleContainer();
+
+ // title
+ HtmlLayoutContainer title = new HtmlLayoutContainer(
+ "" + SERVICE_INFO_TITLE + "");
+ sectionTitle.add(title, new MarginData());
+ sectionTitle.getElement().getStyle().setMarginRight(20, Unit.PX);
+ v.add(sectionTitle, new VerticalLayoutData(-1, -1, new Margins(10)));
+
+ // subtitle
+ HtmlLayoutContainer subtitle = new HtmlLayoutContainer(
+ "This page reports information on the DataMiner "
+ + "service instance serving this working environment giving an up to date "
+ + "picture of its capacities and capabilities.
");
+ sectionSubTitle.add(subtitle, new MarginData());
+ sectionSubTitle.getElement().getStyle().setMarginRight(20, Unit.PX);
+ v.add(sectionSubTitle, new VerticalLayoutData(-1, -1, new Margins(10)));
+
+ }
+
+ private FieldSet environmentView() {
+ try {
+ environmentVBox = new VerticalLayoutContainer();
+
+ FieldSet configurationFieldSet = new FieldSet();
+ configurationFieldSet.setHeadingText(RUNTIME_FEATURE);
+ configurationFieldSet.setCollapsible(true);
+ configurationFieldSet.add(environmentVBox);
+ configurationFieldSet.getElement().getStyle().setMarginRight(20, Unit.PX);
+ return configurationFieldSet;
+ } catch (Throwable e) {
+ Log.error("Error in ServiceInfoPanel in environment: " + e.getLocalizedMessage(), e);
+ throw e;
+ }
+ }
+
+ private void showAddress(String address) {
+ // Service address
+ SimpleContainer sectionServerAddress = new SimpleContainer();
+
+ HtmlLayoutContainer addressHtml = new HtmlLayoutContainer(
+ "The base url of the service instance is: " + ""
+ + address + "
");
+ sectionServerAddress.add(addressHtml, new MarginData());
+ sectionServerAddress.getElement().getStyle().setMarginRight(20, Unit.PX);
+ v.add(sectionServerAddress, new VerticalLayoutData(-1, -1, new Margins(10)));
+
+ }
+
+ private void showServiceInfo(ServiceInfo serviceInfo) {
+
+ if (serviceInfo != null) {
+
+ String address=serviceInfo.getServiceAddress();
+ if(address!=null&&!address.isEmpty()){
+ showAddress(address);
+ }
+
+ FieldSet environmentFieldSet = environmentView();
+ v.add(environmentFieldSet, new VerticalLayoutData(-1, -1, new Margins(10)));
+
+ ArrayList properties=serviceInfo.getServiceProperties();
+ if (properties!=null&&!properties.isEmpty()) {
+ Grid grid = createInfoGrid(properties);
+ environmentVBox.add(grid, new VerticalLayoutData(1, -1, new Margins(0, 4, 0, 4)));
+ } else {
+ HtmlLayoutContainer emptyInfoContainer = new HtmlLayoutContainer(
+ "");
+
+ environmentVBox.add(emptyInfoContainer, new VerticalLayoutData(1, -1, new Margins(0, 4, 0, 4)));
+ }
+ } else {
+ FieldSet environmentFieldSet = environmentView();
+ v.add(environmentFieldSet, new VerticalLayoutData(-1, -1, new Margins(10)));
+
+ HtmlLayoutContainer emptyInfoContainer = new HtmlLayoutContainer(
+ "");
+
+ environmentVBox.add(emptyInfoContainer, new VerticalLayoutData(1, -1, new Margins(0, 4, 0, 4)));
+ }
+
+ forceLayout();
+
+ }
+
+ private Grid createInfoGrid(ArrayList properties) {
+
+ ColumnConfig keyCol = new ColumnConfig(props.key(), 100,
+ "Key");
+ ColumnConfig valueCol = new ColumnConfig(props.value(), 100,
+ "Value");
+ ColumnConfig categoryCol = new ColumnConfig(props.category(),
+ 100,"Category");
+
+ List> columns = new ArrayList>();
+ columns.add(keyCol);
+ columns.add(valueCol);
+ columns.add(categoryCol);
+
+ ColumnModel cm = new ColumnModel(columns);
+
+ ListStore store = new ListStore(props.id());
+ store.addAll(properties);
+
+ final GroupingView groupingView = new GroupingView();
+ groupingView.setShowGroupedColumn(false);
+ groupingView.groupBy(categoryCol);
+ groupingView.setForceFit(true);
+ groupingView.setAutoExpandColumn(valueCol);
+ groupingView.setEmptyText("No info retrieved");
+
+ // grid.getView().setAutoFill(true);
+ // groupingView.setStripeRows(true);
+ // groupingView.setColumnLines(true);
+
+ Grid grid = new Grid(store, cm, groupingView);
+
+ grid.setAllowTextSelection(false);
+ grid.setAllowTextSelection(true);
+ grid.setBorders(false);
+ grid.setColumnReordering(false);
+
+ // Stage manager, turn on state management
+ grid.setStateful(true);
+ grid.setStateId("gridServiceInfoData");
+
+ return grid;
+
+ }
+
+}
diff --git a/src/main/java/org/gcube/portlets/user/dataminerexecutor/client/resources/Resources.java b/src/main/java/org/gcube/portlets/user/dataminerexecutor/client/resources/Resources.java
index 45dc9cd..17333de 100644
--- a/src/main/java/org/gcube/portlets/user/dataminerexecutor/client/resources/Resources.java
+++ b/src/main/java/org/gcube/portlets/user/dataminerexecutor/client/resources/Resources.java
@@ -87,6 +87,9 @@ public interface Resources extends ClientBundle {
@Source("download.png")
ImageResource download();
+ @Source("page-white.png")
+ ImageResource pageWhite();
+
@Source("show.png")
ImageResource netcdf();
diff --git a/src/main/java/org/gcube/portlets/user/dataminerexecutor/client/resources/page-white.png b/src/main/java/org/gcube/portlets/user/dataminerexecutor/client/resources/page-white.png
new file mode 100644
index 0000000000000000000000000000000000000000..3075584d09238dc23d8c902627c649df09f1f8ae
GIT binary patch
literal 293
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_)JY5_^
zEPCf&JebvDAkzBqztm-?H-66)Z-s`x-TmEjSLx$L(t@ljr7j&k!z)#?rr1H{!OtBZ
zxvuYF)R%cK{$tr5T~NSdE>_xMm)^5_b+eL^}Wn6;rY*{
zt5)e}zg?}Q?cic?Y(i>e%@>{k5!bE>%gY5PMnw3rJ(zRYlD%N&vX_~{3`zn{9Z%Q2
z{&4T{-sL){f4o&&&@nAIXJ#zJ0g2-6H5_kzi?}YF1(F;Zlk%R4FuXo%!=f>X>2~qm
o&VT*wjV4vCelB+YW!4S$eg*ZL^%Me^0DZ~e>FVdQ&MBb@0N9*-rvLx|
literal 0
HcmV?d00001
diff --git a/src/main/java/org/gcube/portlets/user/dataminerexecutor/client/rpc/DataMinerExecutorService.java b/src/main/java/org/gcube/portlets/user/dataminerexecutor/client/rpc/DataMinerExecutorService.java
index 65264ac..d644564 100644
--- a/src/main/java/org/gcube/portlets/user/dataminerexecutor/client/rpc/DataMinerExecutorService.java
+++ b/src/main/java/org/gcube/portlets/user/dataminerexecutor/client/rpc/DataMinerExecutorService.java
@@ -10,6 +10,7 @@ import org.gcube.data.analysis.dataminermanagercl.shared.parameters.Parameter;
import org.gcube.data.analysis.dataminermanagercl.shared.process.ComputationStatus;
import org.gcube.data.analysis.dataminermanagercl.shared.process.Operator;
import org.gcube.data.analysis.dataminermanagercl.shared.process.OperatorsClassification;
+import org.gcube.data.analysis.dataminermanagercl.shared.service.ServiceInfo;
import org.gcube.data.analysis.dataminermanagercl.shared.workspace.DataMinerWorkArea;
import org.gcube.data.analysis.dataminermanagercl.shared.workspace.ItemDescription;
import org.gcube.portlets.user.dataminerexecutor.shared.exception.ServiceException;
@@ -57,4 +58,5 @@ public interface DataMinerExecutorService extends RemoteService {
public InvocationModel getInvocationModel(String invocationModelFileUrl) throws ServiceException;
+ public ServiceInfo getServiceInfo() throws ServiceException;
}
diff --git a/src/main/java/org/gcube/portlets/user/dataminerexecutor/client/rpc/DataMinerExecutorServiceAsync.java b/src/main/java/org/gcube/portlets/user/dataminerexecutor/client/rpc/DataMinerExecutorServiceAsync.java
index 3eb0f03..ce42b9c 100644
--- a/src/main/java/org/gcube/portlets/user/dataminerexecutor/client/rpc/DataMinerExecutorServiceAsync.java
+++ b/src/main/java/org/gcube/portlets/user/dataminerexecutor/client/rpc/DataMinerExecutorServiceAsync.java
@@ -10,6 +10,7 @@ import org.gcube.data.analysis.dataminermanagercl.shared.parameters.Parameter;
import org.gcube.data.analysis.dataminermanagercl.shared.process.ComputationStatus;
import org.gcube.data.analysis.dataminermanagercl.shared.process.Operator;
import org.gcube.data.analysis.dataminermanagercl.shared.process.OperatorsClassification;
+import org.gcube.data.analysis.dataminermanagercl.shared.service.ServiceInfo;
import org.gcube.data.analysis.dataminermanagercl.shared.workspace.DataMinerWorkArea;
import org.gcube.data.analysis.dataminermanagercl.shared.workspace.ItemDescription;
import org.gcube.portlets.user.dataminerexecutor.shared.process.InvocationModel;
@@ -60,5 +61,6 @@ public interface DataMinerExecutorServiceAsync {
void getItemDescription(String itemId, AsyncCallback asyncCallback);
void getInvocationModel(String invocationModelFileUrl, AsyncCallback callback);
-
+
+ void getServiceInfo(AsyncCallback asyncCallback);
}
diff --git a/src/main/java/org/gcube/portlets/user/dataminerexecutor/client/widgets/FileViewer.java b/src/main/java/org/gcube/portlets/user/dataminerexecutor/client/widgets/FileViewer.java
index c94e8b8..cd85d82 100644
--- a/src/main/java/org/gcube/portlets/user/dataminerexecutor/client/widgets/FileViewer.java
+++ b/src/main/java/org/gcube/portlets/user/dataminerexecutor/client/widgets/FileViewer.java
@@ -13,6 +13,9 @@ import com.google.gwt.user.client.Window;
import com.sencha.gxt.core.client.dom.XDOM;
import com.sencha.gxt.core.client.util.Margins;
import com.sencha.gxt.widget.core.client.button.TextButton;
+import com.sencha.gxt.widget.core.client.container.BoxLayoutContainer.BoxLayoutData;
+import com.sencha.gxt.widget.core.client.container.HBoxLayoutContainer;
+import com.sencha.gxt.widget.core.client.container.HBoxLayoutContainer.HBoxLayoutAlign;
import com.sencha.gxt.widget.core.client.container.HtmlLayoutContainer;
import com.sencha.gxt.widget.core.client.container.SimpleContainer;
import com.sencha.gxt.widget.core.client.container.VerticalLayoutContainer;
@@ -38,7 +41,7 @@ public class FileViewer extends SimpleContainer {
*/
public FileViewer(ComputationId computationId, FileResource fileResource) {
super();
- GWT.log("FileViewer: [computationId="+computationId+", fileResource="+fileResource+"]");
+ GWT.log("FileViewer: [computationId=" + computationId + ", fileResource=" + fileResource + "]");
this.fileResource = fileResource;
// this.computationId = computationId;
init();
@@ -52,21 +55,37 @@ public class FileViewer extends SimpleContainer {
private void create() {
VerticalLayoutContainer lc = new VerticalLayoutContainer();
final String fileName = fileResource.getName();
+ String fileDescription = fileResource.getDescription();
final String fileUrl = fileResource.getUrl();
+
+ if(fileDescription==null||fileDescription.isEmpty()){
+ fileDescription="Unknow";
+ }
HtmlLayoutContainer fileNameHtml = new HtmlLayoutContainer(""
- + new SafeHtmlBuilder().appendEscaped(fileName).toSafeHtml().asString() + "
");
+ + new SafeHtmlBuilder().appendEscaped(fileDescription).toSafeHtml().asString() + "
");
lc.add(fileNameHtml, new VerticalLayoutData(-1, -1, new Margins(0)));
- TextButton downloadBtn = new TextButton("Download File");
- downloadBtn.setIcon(DataMinerExecutor.resources.download());
- downloadBtn.addSelectHandler(new SelectEvent.SelectHandler() {
+
+ TextButton showFileButton = new TextButton("Show");
+ showFileButton.setIcon(DataMinerExecutor.resources.pageWhite());
+ showFileButton.addSelectHandler(new SelectEvent.SelectHandler() {
+
@Override
public void onSelect(SelectEvent event) {
- GWT.log("Download File url: "+fileUrl);
+ showFileCreate();
+ }
+ });
+
+ TextButton downloadButton = new TextButton("Download");
+ downloadButton.setIcon(DataMinerExecutor.resources.download());
+ downloadButton.addSelectHandler(new SelectEvent.SelectHandler() {
+ @Override
+ public void onSelect(SelectEvent event) {
+ GWT.log("Download File url: " + fileUrl);
Window.open(fileUrl, fileName, "");
}
});
-
+
TextButton netcdfButton = new TextButton("");
netcdfButton.setIcon(DataMinerExecutor.resources.netcdf());
netcdfButton.addSelectHandler(new SelectEvent.SelectHandler() {
@@ -77,13 +96,41 @@ public class FileViewer extends SimpleContainer {
}
});
- lc.add(downloadBtn, new VerticalLayoutData(-1, -1, new Margins(0)));
- if (fileResource.isNetcdf()) {
- lc.add(netcdfButton, new VerticalLayoutData(-1, -1, new Margins(0)));
+ HBoxLayoutContainer buttonsContainer = new HBoxLayoutContainer();
+ buttonsContainer.setHBoxLayoutAlign(HBoxLayoutAlign.MIDDLE);
+ BoxLayoutData buttonBoxLayoutData = new BoxLayoutData(new Margins(2, 2, 2, 2));
+ // HorizontalLayoutData buttonBoxLayoutData = new
+ // HorizontalLayoutData(-1, -1, new Margins(2));
+
+ if (fileName != null && !fileName.isEmpty()) {
+ String fileNameLowerCase = fileName.toLowerCase();
+ if (fileNameLowerCase.endsWith(".html") || fileNameLowerCase.endsWith(".htm")
+ || fileNameLowerCase.endsWith(".pdf")|| fileNameLowerCase.endsWith(".log") || fileNameLowerCase.endsWith(".json")
+ || fileNameLowerCase.endsWith(".txt")) {
+ buttonsContainer.add(showFileButton, buttonBoxLayoutData);
+ }
}
+ buttonsContainer.add(downloadButton, buttonBoxLayoutData);
+ if (fileResource.isNetcdf()) {
+ buttonsContainer.add(netcdfButton, buttonBoxLayoutData);
+ }
+
+ lc.add(buttonsContainer);
+
add(lc);
}
+ private void showFileCreate() {
+ if (fileResource != null && fileResource.getUrl() != null && !fileResource.getUrl().isEmpty()) {
+ GWT.log("ShowFileCreate");
+
+ ShowFileDialog showFileDialog = new ShowFileDialog(fileResource.getUrl());
+ showFileDialog.setZIndex(XDOM.getTopZIndex());
+ showFileDialog.show();
+
+ }
+ }
+
private void showNetCDFFile() {
if (fileResource != null && fileResource.getUrl() != null && !fileResource.getUrl().isEmpty()
&& fileResource.isNetcdf()) {
diff --git a/src/main/java/org/gcube/portlets/user/dataminerexecutor/client/widgets/ShowFileDialog.java b/src/main/java/org/gcube/portlets/user/dataminerexecutor/client/widgets/ShowFileDialog.java
new file mode 100644
index 0000000..4ee6e07
--- /dev/null
+++ b/src/main/java/org/gcube/portlets/user/dataminerexecutor/client/widgets/ShowFileDialog.java
@@ -0,0 +1,82 @@
+package org.gcube.portlets.user.dataminerexecutor.client.widgets;
+
+import com.google.gwt.dom.client.Style.Unit;
+import com.google.gwt.event.logical.shared.ResizeEvent;
+import com.google.gwt.event.logical.shared.ResizeHandler;
+import com.google.gwt.user.client.ui.Frame;
+import com.sencha.gxt.widget.core.client.Dialog;
+import com.sencha.gxt.widget.core.client.container.BoxLayoutContainer.BoxLayoutPack;
+import com.sencha.gxt.widget.core.client.container.VerticalLayoutContainer;
+import com.sencha.gxt.widget.core.client.container.VerticalLayoutContainer.VerticalLayoutData;
+
+/**
+ *
+ * Simple file show dialog
+ *
+ * @author Giancarlo Panichi
+ *
+ *
+ */
+public class ShowFileDialog extends Dialog {
+
+ private String url;
+ private Frame frame;
+
+ public ShowFileDialog(String url) {
+ super();
+ this.url = url;
+ init();
+ create();
+ }
+
+ private void init() {
+ setWidth("640px");
+ setHeight("480px");
+ setResizable(true);
+ setHeadingText("View");
+ setModal(true);
+ setMaximizable(true);
+ setPredefinedButtons(PredefinedButton.CLOSE);
+ setButtonAlign(BoxLayoutPack.CENTER);
+ getButtonBar();
+
+ }
+
+ private void create() {
+ /*
+ * VerticalLayoutContainer vc = new VerticalLayoutContainer();
+ *
+ * HtmlLayoutContainer propertyHtmlContainer = new HtmlLayoutContainer(
+ * "");
+ *
+ * vc.add(propertyHtmlContainer, new VerticalLayoutData(-1, -1, new
+ * Margins(0)));
+ *
+ * add(vc);
+ */
+
+ VerticalLayoutContainer vc = new VerticalLayoutContainer();
+ vc.addResizeHandler(new ResizeHandler() {
+
+ @Override
+ public void onResize(ResizeEvent event) {
+ manageResize(event);
+ }
+ });
+ frame = new Frame(url+"?content-disposition=inline");
+
+ frame.getElement().setAttribute("style", "margin:auto;");
+ frame.getElement().getStyle().setBorderWidth(0, Unit.PX);
+ frame.getElement().getStyle().setBackgroundColor("white");
+ vc.add(frame, new VerticalLayoutData(-1,-1));
+ add(vc);
+ }
+
+ private void manageResize(ResizeEvent event){
+ frame.setHeight(String.valueOf(event.getHeight())+"px");
+ frame.setWidth(String.valueOf(event.getWidth())+"px");
+ forceLayout();
+ }
+
+}
\ No newline at end of file
diff --git a/src/main/java/org/gcube/portlets/user/dataminerexecutor/server/DataMinerExecutorServiceImpl.java b/src/main/java/org/gcube/portlets/user/dataminerexecutor/server/DataMinerExecutorServiceImpl.java
index 974d175..87e0f14 100644
--- a/src/main/java/org/gcube/portlets/user/dataminerexecutor/server/DataMinerExecutorServiceImpl.java
+++ b/src/main/java/org/gcube/portlets/user/dataminerexecutor/server/DataMinerExecutorServiceImpl.java
@@ -17,6 +17,7 @@ import org.gcube.data.analysis.dataminermanagercl.shared.parameters.Parameter;
import org.gcube.data.analysis.dataminermanagercl.shared.process.ComputationStatus;
import org.gcube.data.analysis.dataminermanagercl.shared.process.Operator;
import org.gcube.data.analysis.dataminermanagercl.shared.process.OperatorsClassification;
+import org.gcube.data.analysis.dataminermanagercl.shared.service.ServiceInfo;
import org.gcube.data.analysis.dataminermanagercl.shared.workspace.DataMinerWorkArea;
import org.gcube.data.analysis.dataminermanagercl.shared.workspace.ItemDescription;
import org.gcube.data.analysis.dminvocation.ActionType;
@@ -31,6 +32,7 @@ import org.gcube.portlets.user.dataminerexecutor.shared.exception.ServiceExcepti
import org.gcube.portlets.user.dataminerexecutor.shared.process.InvocationAction;
import org.gcube.portlets.user.dataminerexecutor.shared.process.InvocationModel;
import org.gcube.portlets.user.dataminerexecutor.shared.session.UserInfo;
+import org.gcube.portlets.user.dataminerexecutor.server.SessionUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -465,5 +467,25 @@ public class DataMinerExecutorServiceImpl extends RemoteServiceServlet implement
throw new ServiceException("Error retrieving item description: " + e.getLocalizedMessage(), e);
}
}
+
+ @Override
+ public ServiceInfo getServiceInfo() throws ServiceException {
+ try {
+ HttpServletRequest httpRequest = this.getThreadLocalRequest();
+ ServiceCredentials serviceCredentials = SessionUtil.getServiceCredentials(httpRequest);
+
+ SClient smClient = SessionUtil.getSClient(httpRequest, serviceCredentials);
+ logger.debug("GetServiceInfo()");
+
+ ServiceInfo serviceInfo = smClient.getServiceInfo();
+ return serviceInfo;
+ } catch (ServiceException e) {
+ logger.error(e.getLocalizedMessage(),e);
+ throw e;
+ } catch (Throwable e) {
+ logger.error("Error retrieving Service Info: " + e.getLocalizedMessage(), e);
+ throw new ServiceException(e.getLocalizedMessage(), e);
+ }
+ }
}
diff --git a/src/test/java/org/gcube/portlets/user/dataminerexecutor/TestDataMinerService.java b/src/test/java/org/gcube/portlets/user/dataminerexecutor/TestDataMinerService.java
index 82d872f..ede6855 100644
--- a/src/test/java/org/gcube/portlets/user/dataminerexecutor/TestDataMinerService.java
+++ b/src/test/java/org/gcube/portlets/user/dataminerexecutor/TestDataMinerService.java
@@ -16,8 +16,6 @@ import java.util.ArrayList;
import java.util.List;
import java.util.zip.GZIPInputStream;
-import junit.framework.TestCase;
-
import org.apache.commons.codec.binary.Base64;
import org.gcube.common.authorization.library.provider.UserInfo;
import org.gcube.data.analysis.dataminermanagercl.server.is.InformationSystemUtils;
@@ -26,6 +24,8 @@ import org.gcube.portlets.user.dataminerexecutor.shared.Constants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import junit.framework.TestCase;
+
/**
*
* @author Giancarlo Panichi
@@ -34,8 +34,7 @@ import org.slf4j.LoggerFactory;
*/
public class TestDataMinerService extends TestCase {
- private static Logger logger = LoggerFactory
- .getLogger(TestDataMinerService.class);
+ private static Logger logger = LoggerFactory.getLogger(TestDataMinerService.class);
private String wpsToken;
private String wpsUser;
@@ -43,70 +42,64 @@ public class TestDataMinerService extends TestCase {
private String scope;
private void retrieveServicesInfo() throws Exception {
-
- logger.info("Use test user");
- // Remove comment for Test
- wpsUser = Constants.DEFAULT_USER;
- scope = Constants.DEFAULT_SCOPE;
-
- ServiceCredentials serviceCredentials=new ServiceCredentials();
- serviceCredentials.setUserName(wpsUser);
- serviceCredentials.setScope(scope);
-
- List userRoles = new ArrayList<>();
- userRoles.add(Constants.DEFAULT_ROLE);
- /*
- * if (aslSession.getUsername().compareTo("lucio.lelii") == 0)
- * userRoles.add("VRE-Manager");
- */
-
- try {
- wpsToken = authorizationService().generateUserToken(
- new UserInfo(serviceCredentials.getUserName(), userRoles),
- serviceCredentials.getScope());
- } catch (Exception e) {
- logger.error("Error generating the token for test: "
- + e.getLocalizedMessage());
- e.printStackTrace();
- throw new Exception("Error generating the token for test: "
- + e.getLocalizedMessage());
- }
- serviceCredentials.setToken(wpsToken);
+ logger.info("Use test user");
- List serviceAddress = InformationSystemUtils
- .retrieveServiceAddress(
- Constants.DATAMINER_SERVICE_CATEGORY,
- Constants.DATA_MINER_SERVICE_NAME, serviceCredentials.getScope());
- logger.debug("Service Address retrieved:" + serviceAddress);
- if (serviceAddress == null || serviceAddress.size() < 1) {
- logger.error("No DataMiner service address available!");
- throw new Exception("No DataMiner service address available!");
- } else {
- logger.info("DataMiner service address found: "
- + serviceAddress.get(0));
- wpsProcessingServlet = serviceAddress.get(0);
+ // Remove comment for Test
+ wpsUser = Constants.DEFAULT_USER;
+ scope = Constants.DEFAULT_SCOPE;
+
+ ServiceCredentials serviceCredentials = new ServiceCredentials();
+ serviceCredentials.setUserName(wpsUser);
+ serviceCredentials.setScope(scope);
+
+ List userRoles = new ArrayList<>();
+ userRoles.add(Constants.DEFAULT_ROLE);
+ /*
+ * if (aslSession.getUsername().compareTo("lucio.lelii") == 0)
+ * userRoles.add("VRE-Manager");
+ */
+
+ try {
+ wpsToken = authorizationService().generateUserToken(
+ new UserInfo(serviceCredentials.getUserName(), userRoles), serviceCredentials.getScope());
+ } catch (Exception e) {
+ logger.error("Error generating the token for test: " + e.getLocalizedMessage(), e);
+
+ throw new Exception("Error generating the token for test: " + e.getLocalizedMessage(), e);
+ }
+ serviceCredentials.setToken(wpsToken);
+
+ String serviceAddress = InformationSystemUtils.retrieveServiceAddress(Constants.DATAMINER_SERVICE_CATEGORY,
+ Constants.DATA_MINER_SERVICE_NAME, serviceCredentials.getScope());
+ logger.debug("Service Address retrieved:" + serviceAddress);
+ if (serviceAddress == null || serviceAddress.isEmpty()) {
+ logger.error("No DataMiner service address available!");
+ throw new Exception("No DataMiner service address available!");
+ } else {
+ logger.info("DataMiner service address found: " + serviceAddress);
+ wpsProcessingServlet = serviceAddress;
+
+ }
- }
-
}
public void testExecuteProcess() {
- if(Constants.TEST_ENABLE){
+ if (Constants.TEST_ENABLE) {
executeProcess();
} else {
assertTrue(true);
-
+
}
}
-
- private void executeProcess(){
-
+
+ private void executeProcess() {
+
try {
-
+
retrieveServicesInfo();
-
- String urlString=wpsProcessingServlet;
+
+ String urlString = wpsProcessingServlet;
logger.debug("RetrieveDataViaPost(): " + urlString);
String authString = wpsUser + ":" + wpsToken;
@@ -123,9 +116,9 @@ public class TestDataMinerService extends TestCase {
conn.setRequestProperty("Content-Type", "text/xml");
conn.setDoOutput(true);
OutputStream output = conn.getOutputStream();
- Path currentPath=Paths.get(".");
- logger.info("CurrentPath:"+currentPath.toAbsolutePath().toString());
-
+ Path currentPath = Paths.get(".");
+ logger.info("CurrentPath:" + currentPath.toAbsolutePath().toString());
+
Files.copy(Paths.get("TestDataMinerServiceDBSCAN.xml"), output);
InputStream input = null;
@@ -136,24 +129,23 @@ public class TestDataMinerService extends TestCase {
input = conn.getInputStream();
}
- BufferedReader r = new BufferedReader(new InputStreamReader(input,
- StandardCharsets.UTF_8));
+ BufferedReader r = new BufferedReader(new InputStreamReader(input, StandardCharsets.UTF_8));
logger.info("Response:");
String str = null;
while ((str = r.readLine()) != null) {
logger.info(str);
}
-
+
logger.info("End Response!");
assertTrue(true);
-
+
} catch (Exception e) {
logger.debug(e.getLocalizedMessage());
e.printStackTrace();
fail(e.getLocalizedMessage());
-
+
}
}
diff --git a/src/test/java/org/gcube/portlets/user/dataminerexecutor/TestInformationSystemRequests.java b/src/test/java/org/gcube/portlets/user/dataminerexecutor/TestInformationSystemRequests.java
new file mode 100644
index 0000000..118e6ae
--- /dev/null
+++ b/src/test/java/org/gcube/portlets/user/dataminerexecutor/TestInformationSystemRequests.java
@@ -0,0 +1,100 @@
+package org.gcube.portlets.user.dataminerexecutor;
+
+import static org.gcube.common.authorization.client.Constants.authorizationService;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.gcube.common.authorization.library.provider.UserInfo;
+import org.gcube.data.analysis.dataminermanagercl.server.is.InformationSystemUtils;
+import org.gcube.data.analysis.dataminermanagercl.server.util.ServiceCredentials;
+import org.gcube.data.analysis.dataminermanagercl.shared.service.ServiceInfo;
+import org.gcube.data.analysis.dataminermanagercl.shared.service.ServiceInfoData;
+import org.gcube.portlets.user.dataminerexecutor.shared.Constants;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import junit.framework.TestCase;
+
+/**
+ *
+ * @author Giancarlo Panichi
+ *
+ *
+ */
+public class TestInformationSystemRequests extends TestCase {
+
+ private static Logger logger = LoggerFactory.getLogger(TestInformationSystemRequests.class);
+
+ private String wpsToken;
+ private String wpsUser;
+ private String scope;
+
+ private void retrieveServicesInfo() throws Exception {
+
+ logger.info("Use test user");
+
+ wpsUser = Constants.DEFAULT_USER;
+ scope = Constants.DEFAULT_SCOPE;
+
+ ServiceCredentials serviceCredentials = new ServiceCredentials();
+ serviceCredentials.setUserName(wpsUser);
+ serviceCredentials.setScope(scope);
+
+ List userRoles = new ArrayList<>();
+ userRoles.add(Constants.DEFAULT_ROLE);
+
+ try {
+ wpsToken = authorizationService().generateUserToken(
+ new UserInfo(serviceCredentials.getUserName(), userRoles), serviceCredentials.getScope());
+ } catch (Exception e) {
+ logger.error("Error generating the token for test: " + e.getLocalizedMessage(), e);
+
+ throw new Exception("Error generating the token for test: " + e.getLocalizedMessage(), e);
+ }
+ serviceCredentials.setToken(wpsToken);
+
+ String serviceAddress = InformationSystemUtils.retrieveServiceAddress(Constants.DATAMINER_SERVICE_CATEGORY,
+ Constants.DATA_MINER_SERVICE_NAME, serviceCredentials.getScope());
+ logger.debug("Service Address retrieved:" + serviceAddress);
+ if (serviceAddress == null || serviceAddress.isEmpty()) {
+ logger.error("No DataMiner service address available!");
+ throw new Exception("No DataMiner service address available!");
+ } else {
+ logger.info("DataMiner service address found: " + serviceAddress);
+
+ }
+
+ ServiceInfo serviceInfo = InformationSystemUtils.retrieveServiceInfo(
+ Constants.DATAMINER_SERVICE_CATEGORY, Constants.DATA_MINER_SERVICE_NAME, serviceCredentials.getScope());
+ logger.debug("Service Properties retrieved:" + serviceInfo);
+ if (serviceInfo == null) {
+ logger.error("No DataMiner service properties available!");
+ throw new Exception("No DataMiner service properties available!");
+ } else {
+ logger.info("DataMiner service properties found");
+ logger.debug("Service Address: "+serviceInfo.getServiceAddress());
+ for (ServiceInfoData serviceInfoData : serviceInfo.getServiceProperties()) {
+ logger.debug("Property: " + serviceInfoData);
+ }
+
+ }
+
+ }
+
+ public void testExecuteProcess() {
+ if (Constants.TEST_ENABLE) {
+ try {
+ retrieveServicesInfo();
+ assertTrue(true);
+ } catch (Throwable e) {
+ logger.error(e.getLocalizedMessage(), e);
+ assertTrue(false);
+ }
+ } else {
+ assertTrue(true);
+
+ }
+ }
+
+}