From 16cfe58c6f359424a9717473d1e9e3cd7d69f8c0 Mon Sep 17 00:00:00 2001
From: jakubs <jakubs>
Date: Wed, 24 Jun 2015 11:17:23 +0000
Subject: [PATCH] SSDM-1813 minor changes in new dss service
SVN: 34276
---
.../sis/openbis/generic/dss/api/v3/DataStoreServerApi.java | 3 ++-
.../openbis/generic/dss/api/v3/DataStoreServerApiLogger.java | 4 ++--
.../openbis/generic/dss/api/v3/DataStoreServerApiServer.java | 1 -
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/datastore_server/source/java/ch/ethz/sis/openbis/generic/dss/api/v3/DataStoreServerApi.java b/datastore_server/source/java/ch/ethz/sis/openbis/generic/dss/api/v3/DataStoreServerApi.java
index 5ce0bfcf2b8..dd1ccd77357 100644
--- a/datastore_server/source/java/ch/ethz/sis/openbis/generic/dss/api/v3/DataStoreServerApi.java
+++ b/datastore_server/source/java/ch/ethz/sis/openbis/generic/dss/api/v3/DataStoreServerApi.java
@@ -15,6 +15,7 @@
*/
package ch.ethz.sis.openbis.generic.dss.api.v3;
+import java.util.Collections;
import java.util.List;
import org.apache.log4j.Logger;
@@ -97,7 +98,7 @@ public class DataStoreServerApi extends AbstractDssServiceRpc<IDataStoreServerAp
@Override
public List<DataSetFile> searchFiles(String sessionToken, FileSearchCriterion searchCriterion)
{
- return null;
+ return Collections.emptyList();
}
@Override
diff --git a/datastore_server/source/java/ch/ethz/sis/openbis/generic/dss/api/v3/DataStoreServerApiLogger.java b/datastore_server/source/java/ch/ethz/sis/openbis/generic/dss/api/v3/DataStoreServerApiLogger.java
index d362bee2339..f70aec82d27 100644
--- a/datastore_server/source/java/ch/ethz/sis/openbis/generic/dss/api/v3/DataStoreServerApiLogger.java
+++ b/datastore_server/source/java/ch/ethz/sis/openbis/generic/dss/api/v3/DataStoreServerApiLogger.java
@@ -30,8 +30,8 @@ public class DataStoreServerApiLogger extends AbstractServerLogger implements
@Override
public List<DataSetFile> searchFiles(String sessionToken, FileSearchCriterion searchCriterion)
{
- System.out.println("search files");
- return null; // TODO kuba implement this method
+ logAccess(sessionToken, "search-files", "SEARCH_CRITERION:\n%s\n", searchCriterion);
+ return null;
}
}
\ No newline at end of file
diff --git a/datastore_server/source/java/ch/ethz/sis/openbis/generic/dss/api/v3/DataStoreServerApiServer.java b/datastore_server/source/java/ch/ethz/sis/openbis/generic/dss/api/v3/DataStoreServerApiServer.java
index cf622df51b9..80e639b58d0 100644
--- a/datastore_server/source/java/ch/ethz/sis/openbis/generic/dss/api/v3/DataStoreServerApiServer.java
+++ b/datastore_server/source/java/ch/ethz/sis/openbis/generic/dss/api/v3/DataStoreServerApiServer.java
@@ -42,7 +42,6 @@ public class DataStoreServerApiServer extends AbstractApiServiceExporter
@Override
public void afterPropertiesSet()
{
- System.err.println("After properties set of datastore server server " + service);
establishService(IDataStoreServerApi.class, service, IDataStoreServerApi.SERVICE_NAME,
IDataStoreServerApi.SERVICE_URL);
super.afterPropertiesSet();
--
GitLab