From e8314b8f9adcd17a46827b0fc08649e91e2653b9 Mon Sep 17 00:00:00 2001
From: juanf <juanf>
Date: Mon, 9 Jan 2017 15:24:39 +0000
Subject: [PATCH] SSDM-4452 : getServerInfo implemented returning empty map
SVN: 37566
---
.../generic/server/asapi/v3/ApplicationServerApi.java | 7 +++++++
.../server/asapi/v3/ApplicationServerApiLogger.java | 7 +++++++
.../cisd/openbis/public/resources/api/v3/openbis.js | 11 +++++++++++
.../generic/asapi/v3/IApplicationServerApi.java | 1 +
4 files changed, 26 insertions(+)
diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/ApplicationServerApi.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/ApplicationServerApi.java
index 7e5cc8817f6..5165ac70767 100644
--- a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/ApplicationServerApi.java
+++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/ApplicationServerApi.java
@@ -17,6 +17,7 @@
package ch.ethz.sis.openbis.generic.server.asapi.v3;
import java.util.Arrays;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -784,6 +785,12 @@ public class ApplicationServerApi extends AbstractServer<IApplicationServerApi>
return (T) results.getResults().get(0);
}
+ @Override
+ public Map<String, String> getServerInfo(String sessionToken)
+ {
+ return new HashMap<String, String>();
+ }
+
@Override
public IApplicationServerApi createLogger(IInvocationLoggerContext context)
{
diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/ApplicationServerApiLogger.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/ApplicationServerApiLogger.java
index 40d4f3f8962..8032e1ebb2f 100644
--- a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/ApplicationServerApiLogger.java
+++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/ApplicationServerApiLogger.java
@@ -565,6 +565,13 @@ public class ApplicationServerApiLogger extends AbstractServerLogger implements
return null;
}
+ @Override
+ public Map<String, String> getServerInfo(String sessionToken)
+ {
+ logAccess(sessionToken, "session-info");
+ return null;
+ }
+
@Override
public Map<IOperationExecutionId, OperationExecution> getOperationExecutions(String sessionToken,
List<? extends IOperationExecutionId> executionIds, OperationExecutionFetchOptions fetchOptions)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/openbis.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/openbis.js
index dc1d537eb3f..b0e44920780 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/openbis.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/openbis.js
@@ -875,6 +875,17 @@ define([ 'jquery', 'util/Json' ], function(jquery, stjsUtil) {
});
}
+ this.getServerInfo = function() {
+ var thisFacade = this;
+ return thisFacade._private.ajaxRequest({
+ url : openbisUrl,
+ data : {
+ "method" : "getServerInfo",
+ "params" : [ thisFacade._private.sessionToken]
+ }
+ });
+ }
+
/**
* =======================
* OpenBIS webapp context
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/IApplicationServerApi.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/IApplicationServerApi.java
index ee4eaffc0c2..69842f7a29e 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/IApplicationServerApi.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/IApplicationServerApi.java
@@ -285,4 +285,5 @@ public interface IApplicationServerApi extends IRpcService
public IOperationExecutionResults executeOperations(String sessionToken, List<? extends IOperation> operations,
IOperationExecutionOptions options);
+ public Map<String, String> getServerInfo(String sessionToken);
}
--
GitLab