From b78cb286f5736fbc978e7e68c927da8797c4a08c Mon Sep 17 00:00:00 2001
From: Yves Noirjean <yves.noirjean@id.ethz.ch>
Date: Thu, 15 Mar 2018 14:58:08 +0100
Subject: [PATCH] SSDM-6118: removed @TechPreview for content copy / external
DMS
---
.../sis/openbis/generic/asapi/v3/IApplicationServerApi.java | 5 -----
.../openbis/generic/asapi/v3/dto/dataset/ContentCopy.java | 1 -
.../sis/openbis/generic/asapi/v3/dto/dataset/LinkedData.java | 2 --
.../asapi/v3/dto/dataset/create/ContentCopyCreation.java | 1 -
.../asapi/v3/dto/dataset/create/LinkedDataCreation.java | 2 --
.../generic/asapi/v3/dto/dataset/id/IContentCopyId.java | 1 -
.../v3/dto/dataset/update/ContentCopyListUpdateValue.java | 1 -
.../asapi/v3/dto/dataset/update/LinkedDataUpdate.java | 2 --
.../generic/asapi/v3/dto/externaldms/ExternalDms.java | 4 ----
.../asapi/v3/dto/externaldms/ExternalDmsAddressType.java | 1 -
.../asapi/v3/dto/externaldms/create/ExternalDmsCreation.java | 1 -
11 files changed, 21 deletions(-)
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 8dbf59e1135..d79db0758de 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
@@ -280,7 +280,6 @@ public interface IApplicationServerApi extends IRpcService
public List<PersonPermId> createPersons(String sessionToken, List<PersonCreation> newPersons);
- @TechPreview
public List<ExternalDmsPermId> createExternalDataManagementSystems(String sessionToken,
List<ExternalDmsCreation> newExternalDataManagementSystems);
@@ -306,7 +305,6 @@ public interface IApplicationServerApi extends IRpcService
public void updateMaterialTypes(String sessionToken, List<MaterialTypeUpdate> materialTypeUpdates);
- @TechPreview
public void updateExternalDataManagementSystems(String sessionToken, List<ExternalDmsUpdate> externalDmsUpdates);
public void updatePropertyTypes(String sessionToken, List<PropertyTypeUpdate> propertyTypeUpdates);
@@ -363,7 +361,6 @@ public interface IApplicationServerApi extends IRpcService
public Map<IPersonId, Person> getPersons(String sessionToken, List<? extends IPersonId> ids, PersonFetchOptions fetchOptions);
- @TechPreview
public Map<IExternalDmsId, ExternalDms> getExternalDataManagementSystems(String sessionToken, List<? extends IExternalDmsId> externalDmsIds,
ExternalDmsFetchOptions fetchOptions);
@@ -395,7 +392,6 @@ public interface IApplicationServerApi extends IRpcService
public SearchResult<Material> searchMaterials(String sessionToken, MaterialSearchCriteria searchCriteria, MaterialFetchOptions fetchOptions);
- @TechPreview
public SearchResult<ExternalDms> searchExternalDataManagementSystems(String sessionToken, ExternalDmsSearchCriteria searchCriteria,
ExternalDmsFetchOptions fetchOptions);
@@ -469,7 +465,6 @@ public interface IApplicationServerApi extends IRpcService
public void deleteEntityTypes(String sessionToken, List<? extends IEntityTypeId> entityTypeIds, EntityTypeDeletionOptions deletionOptions);
- @TechPreview
public void deleteExternalDataManagementSystems(String sessionToken, List<? extends IExternalDmsId> externalDmsIds,
ExternalDmsDeletionOptions deletionOptions);
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/ContentCopy.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/ContentCopy.java
index 64e880e3d11..948bbe58375 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/ContentCopy.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/ContentCopy.java
@@ -26,7 +26,6 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
import ch.systemsx.cisd.common.annotation.TechPreview;
@JsonObject("as.dto.dataset.ContentCopy")
-@TechPreview
public class ContentCopy implements Serializable
{
private static final long serialVersionUID = 1L;
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 edc9261d587..3ef279c4634 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
@@ -93,14 +93,12 @@ public class LinkedData implements Serializable
this.externalDms = externalDms;
}
- @TechPreview
@JsonIgnore
public List<ContentCopy> getContentCopies()
{
return contentCopies;
}
- @TechPreview
public void setContentCopies(List<ContentCopy> contentCopies)
{
this.contentCopies = contentCopies;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/create/ContentCopyCreation.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/create/ContentCopyCreation.java
index 8d476c95707..5442de248c1 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/create/ContentCopyCreation.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/create/ContentCopyCreation.java
@@ -22,7 +22,6 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
import ch.systemsx.cisd.common.annotation.TechPreview;
@JsonObject("as.dto.dataset.create.ContentCopyCreation")
-@TechPreview
public class ContentCopyCreation implements ICreation
{
private static final long serialVersionUID = 1L;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/create/LinkedDataCreation.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/create/LinkedDataCreation.java
index b99ccdfaa87..159ede66bc0 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/create/LinkedDataCreation.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/create/LinkedDataCreation.java
@@ -69,13 +69,11 @@ public class LinkedDataCreation implements ICreation
this.externalDmsId = externalDmsId;
}
- @TechPreview
public List<ContentCopyCreation> getContentCopies()
{
return contentCopies;
}
- @TechPreview
public void setContentCopies(List<ContentCopyCreation> contentCopies)
{
this.contentCopies = contentCopies;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/IContentCopyId.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/IContentCopyId.java
index 04f820f6907..0239765000e 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/IContentCopyId.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/IContentCopyId.java
@@ -10,7 +10,6 @@ import ch.systemsx.cisd.common.annotation.TechPreview;
* @author anttil
*/
@JsonObject("as.dto.dataset.id.IContentCopyId")
-@TechPreview
public interface IContentCopyId extends IObjectId
{
}
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/update/ContentCopyListUpdateValue.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/update/ContentCopyListUpdateValue.java
index 7f94bd27033..1857a3e7174 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/update/ContentCopyListUpdateValue.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/update/ContentCopyListUpdateValue.java
@@ -26,7 +26,6 @@ import ch.systemsx.cisd.common.annotation.TechPreview;
* @author pkupczyk
*/
@JsonObject("as.dto.dataset.update.ContentCopyListUpdateValue")
-@TechPreview
public class ContentCopyListUpdateValue extends ListUpdateValue<ContentCopyCreation, IContentCopyId, ContentCopyCreation, Object>
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/update/LinkedDataUpdate.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/update/LinkedDataUpdate.java
index aca5046cb98..80589835986 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/update/LinkedDataUpdate.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/update/LinkedDataUpdate.java
@@ -78,14 +78,12 @@ public class LinkedDataUpdate implements IUpdate
}
@JsonIgnore
- @TechPreview
public ContentCopyListUpdateValue getContentCopies()
{
return contentCopies;
}
@JsonIgnore
- @TechPreview
public void setContentCopyActions(List<ListUpdateAction<Object>> actions)
{
contentCopies.setActions(actions);
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/ExternalDms.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/ExternalDms.java
index 77ce59482db..8435e48b878 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/ExternalDms.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/ExternalDms.java
@@ -134,26 +134,22 @@ public class ExternalDms implements Serializable, ICodeHolder
this.openbis = openbis;
}
- @TechPreview
public void setAddressType(ExternalDmsAddressType type)
{
this.addressType = type;
}
- @TechPreview
@JsonProperty
public ExternalDmsAddressType getAddressType()
{
return addressType;
}
- @TechPreview
public void setAddress(String address)
{
this.address = address;
}
- @TechPreview
@JsonProperty
public String getAddress()
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/ExternalDmsAddressType.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/ExternalDmsAddressType.java
index 806f1d7b483..3fe9b92a8b9 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/ExternalDmsAddressType.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/ExternalDmsAddressType.java
@@ -4,7 +4,6 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
import ch.systemsx.cisd.common.annotation.TechPreview;
@JsonObject("as.dto.externaldms.ExternalDmsAddressType")
-@TechPreview
public enum ExternalDmsAddressType
{
OPENBIS, URL, FILE_SYSTEM;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/create/ExternalDmsCreation.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/create/ExternalDmsCreation.java
index efb297e3887..28ca767cc7e 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/create/ExternalDmsCreation.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/create/ExternalDmsCreation.java
@@ -28,7 +28,6 @@ import ch.systemsx.cisd.common.annotation.TechPreview;
* @author anttil
*/
@JsonObject("as.dto.externaldms.create.ExternalDmsCreation")
-@TechPreview
public class ExternalDmsCreation implements ICreation, IObjectCreation, ICreationIdHolder
{
private static final long serialVersionUID = 1L;
--
GitLab