From 112a72feea3f26af465bc2117717cf3483ae380a Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Tue, 21 May 2013 06:31:42 +0000
Subject: [PATCH] SP-650, BIS-421: Label attribute added to
AggregationServiceDescription
SVN: 29170
---
.../query/server/api/v1/QueryApiServer.java | 3 ++-
.../v1/dto/AggregationServiceDescription.java | 19 ++++++++++++++++++-
2 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/server/api/v1/QueryApiServer.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/server/api/v1/QueryApiServer.java
index 1473cfafe96..6be69f5b17a 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/server/api/v1/QueryApiServer.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/server/api/v1/QueryApiServer.java
@@ -203,6 +203,7 @@ public class QueryApiServer extends AbstractServer<IQueryApiServer> implements I
{
AggregationServiceDescription info = new AggregationServiceDescription();
info.setServiceKey(service.getKey());
+ info.setLabel(service.getLabel());
info.setDataStoreCode(dataStore.getCode());
info.setDataStoreBaseUrl(dataStore.getDownloadUrl());
services.add(info);
@@ -234,7 +235,7 @@ public class QueryApiServer extends AbstractServer<IQueryApiServer> implements I
@Override
public int getMinorVersion()
{
- return 4;
+ return 5;
}
private QueryTableModel translate(TableModel result)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/api/v1/dto/AggregationServiceDescription.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/api/v1/dto/AggregationServiceDescription.java
index 3081ba82603..44fb19a6aa2 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/api/v1/dto/AggregationServiceDescription.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/api/v1/dto/AggregationServiceDescription.java
@@ -36,6 +36,8 @@ public class AggregationServiceDescription implements Serializable
private String serviceKey;
+ private String label;
+
private AggregationServiceType type;
/**
@@ -64,6 +66,16 @@ public class AggregationServiceDescription implements Serializable
return serviceKey;
}
+ /**
+ * Returns the label of the service.
+ *
+ * @since 1.5
+ */
+ public String getLabel()
+ {
+ return label;
+ }
+
/**
* The type of the service. Non-null.
*/
@@ -89,6 +101,11 @@ public class AggregationServiceDescription implements Serializable
this.serviceKey = key;
}
+ public void setLabel(String label)
+ {
+ this.label = label;
+ }
+
public void setType(AggregationServiceType type)
{
this.type = type;
@@ -98,6 +115,6 @@ public class AggregationServiceDescription implements Serializable
public String toString()
{
return "AggregationServiceDescription [dataStoreCode=" + dataStoreCode + ", serviceKey="
- + serviceKey + ", type=" + type + "]";
+ + serviceKey + ", label=" + label + ", type=" + type + "]";
}
}
--
GitLab