Minor simplification to DataSetLister.

SVN: 27090

openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/datasetlister/DataSetDownloadRecord.java

@@ -23,9 +23,7 @@ package ch.systemsx.cisd.openbis.generic.server.business.bo.fetchoptions.dataset
  */
 class DataSetDownloadRecord
 {
-    String download_url;
-
-    String remote_url;
+    String url;
 
     String data_set_codes;
 }
\ No newline at end of file

openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/datasetlister/DataSetLister.java

@@ -328,7 +328,7 @@ public class DataSetLister implements IDataSetLister
             final String[] dataSetCodeArray =
                     StringUtils.split(r.data_set_codes.substring(1, r.data_set_codes.length() - 1),
                             ',');
-            result.add(new DataStoreURLForDataSets(r.download_url, dataSetCodeArray));
+            result.add(new DataStoreURLForDataSets(r.url, dataSetCodeArray));
         }
         return result;
     }
@@ -345,7 +345,7 @@ public class DataSetLister implements IDataSetLister
             final String[] dataSetCodeArray =
                     StringUtils.split(r.data_set_codes.substring(1, r.data_set_codes.length() - 1),
                             ',');
-            result.add(new DataStoreURLForDataSets(r.remote_url, dataSetCodeArray));
+            result.add(new DataStoreURLForDataSets(r.url, dataSetCodeArray));
         }
         return result;
     }

openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/datasetlister/IDataSetListingQuery.java

@@ -69,13 +69,13 @@ public interface IDataSetListingQuery extends BaseQuery
         { StringArrayMapper.class })
     public List<DataSetRelationRecord> getDataSetChildrenCodes(String[] dataSetCodes);
 
-    @Select(sql = " select ds.download_url, array_agg(d.code::text) as data_set_codes"
+    @Select(sql = " select ds.download_url as url, array_agg(d.code::text) as data_set_codes"
             + " from data d left join data_stores ds on ds.id = d.dast_id"
             + " where d.code = any(?{1}) group by ds.download_url", parameterBindings =
         { StringArrayMapper.class })
     public List<DataSetDownloadRecord> getDownloadURLs(String[] dataSetCodes);
 
-    @Select(sql = " select ds.remote_url, array_agg(d.code::text) as data_set_codes"
+    @Select(sql = " select ds.remote_url as url, array_agg(d.code::text) as data_set_codes"
             + " from data d left join data_stores ds on ds.id = d.dast_id"
             + " where d.code = any(?{1}) group by ds.remote_url", parameterBindings =
         { StringArrayMapper.class })