From deedbfe6bbc177247231e573791e8eee6cce2d11 Mon Sep 17 00:00:00 2001
From: anttil <anttil>
Date: Thu, 1 Jun 2017 07:05:06 +0000
Subject: [PATCH] SSDM-4959: fix tests
SVN: 38241
---
.../systemtest/asapi/v3/AbstractLinkDataSetTest.java | 5 +----
.../openbis/generic/asapi/v3/dto/dataset/LinkedData.java | 9 +--------
2 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/AbstractLinkDataSetTest.java b/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/AbstractLinkDataSetTest.java
index 281bffd4485..3d8f402481c 100644
--- a/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/AbstractLinkDataSetTest.java
+++ b/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/AbstractLinkDataSetTest.java
@@ -19,7 +19,6 @@ import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.create.DataSetCreation;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.create.LinkedDataCreation;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.delete.DataSetDeletionOptions;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.fetchoptions.DataSetFetchOptions;
-import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.fetchoptions.LinkedDataFetchOptions;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.id.DataSetPermId;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.id.IContentCopyId;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.id.IDataSetId;
@@ -104,9 +103,7 @@ public abstract class AbstractLinkDataSetTest extends AbstractExternalDmsTest
protected DataSet get(DataSetPermId id)
{
DataSetFetchOptions fo = new DataSetFetchOptions();
- LinkedDataFetchOptions lfo = new LinkedDataFetchOptions();
- lfo.withExternalDms();
- fo.withLinkedDataUsing(lfo);
+ fo.withLinkedData().withExternalDms();
Map<IDataSetId, DataSet> result = v3api.getDataSets(session, Collections.singletonList(id), fo);
return result.get(id);
}
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/LinkedData.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/LinkedData.java
index 98f644c0673..5914886b2ec 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/LinkedData.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/LinkedData.java
@@ -23,7 +23,6 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.fetchoptions.LinkedDataFetchOptions;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.externaldms.ExternalDms;
-import ch.ethz.sis.openbis.generic.asapi.v3.exceptions.NotFetchedException;
import ch.systemsx.cisd.base.annotation.JsonObject;
import ch.systemsx.cisd.common.annotation.TechPreview;
@@ -77,13 +76,7 @@ public class LinkedData implements Serializable
@JsonIgnore
public ExternalDms getExternalDms()
{
- if (getFetchOptions() != null && getFetchOptions().hasExternalDms())
- {
- return externalDms;
- } else
- {
- throw new NotFetchedException("External data management system has not been fetched.");
- }
+ return externalDms;
}
// Method automatically generated with DtoGenerator
--
GitLab