SP-650, BIS-421: Label attribute added to AggregationServiceDescription

SVN: 29170

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)

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 + "]";
     }
 }