From 8775a8cb1ddf86b7e65bd87279f67a1b6a3c72cb Mon Sep 17 00:00:00 2001
From: anttil <anttil>
Date: Thu, 25 Jun 2015 07:51:12 +0000
Subject: [PATCH] SSDM-1813: Return all the files in a dataset instead of only
the ones in the root folder. Improve tests.
SVN: 34287
---
.../api/v3/dto/entity/datasetfile/DataSetFile.java | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/dss/api/v3/dto/entity/datasetfile/DataSetFile.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/dss/api/v3/dto/entity/datasetfile/DataSetFile.java
index 63f5333ea04..7536c8b20c2 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/dss/api/v3/dto/entity/datasetfile/DataSetFile.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/dss/api/v3/dto/entity/datasetfile/DataSetFile.java
@@ -18,12 +18,12 @@ package ch.ethz.sis.openbis.generic.dss.api.v3.dto.entity.datasetfile;
import java.io.Serializable;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
import ch.ethz.sis.openbis.generic.shared.api.v3.dto.id.dataset.DataSetPermId;
import ch.systemsx.cisd.base.annotation.JsonObject;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
/**
* @author Jakub Straszewski
*/
@@ -59,4 +59,10 @@ public class DataSetFile implements Serializable
{
this.fileName = fileName;
}
+
+ @Override
+ public String toString()
+ {
+ return "DataSetFile: " + fileName + ", " + dataSetPermId;
+ }
}
--
GitLab