[LMS-1924] added hostUrl to DataStore DTO to simplify codebase

SVN: 19051

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

@@ -604,6 +604,7 @@ public class DatasetLister extends AbstractLister implements IDatasetLister
     {
         DataStore result = new DataStore();
         setCode(result, codeRecord);
+        result.setHostUrl(codeRecord.download_url);
         String downloadUrl = DataStoreTranslator.translateDownloadUrl(codeRecord.download_url);
         result.setDownloadUrl(downloadUrl);
         return result;

openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataStore.java

@@ -16,7 +16,6 @@
 
 package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
 
-
 /**
  * @author Izabela Adamczyk
  */
@@ -26,6 +25,8 @@ public class DataStore extends Code<DataStore>
 
     private String downloadUrl;
 
+    private String hostUrl;
+
     public String getDownloadUrl()
     {
         return downloadUrl;
@@ -36,4 +37,14 @@ public class DataStore extends Code<DataStore>
         this.downloadUrl = downloadUrl;
     }
 
+    public String getHostUrl()
+    {
+        return hostUrl;
+    }
+
+    public void setHostUrl(String hostUrl)
+    {
+        this.hostUrl = hostUrl;
+    }
+
 }

openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/DataStoreTranslator.java

@@ -30,6 +30,7 @@ public class DataStoreTranslator
     {
         DataStore dataStore = new DataStore();
         String downloadUrl = dataStorePE.getDownloadUrl();
+        dataStore.setHostUrl(downloadUrl);
         downloadUrl = translateDownloadUrl(downloadUrl);
         dataStore.setDownloadUrl(downloadUrl);
         dataStore.setCode(dataStorePE.getCode());

openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/CommonClientServiceTest.java

@@ -476,6 +476,7 @@ public final class CommonClientServiceTest extends AbstractClientServiceTest
         assertEquals(1, list.size());
         ExternalData data = list.get(0);
         // assertEquals(code, data.getCode());
+        assertEquals(DATA_STORE_BASE_URL, data.getDataStore().getHostUrl());
         assertEquals(DATA_STORE_BASE_URL + "/" + DATA_STORE_SERVER_WEB_APPLICATION_NAME, data
                 .getDataStore().getDownloadUrl());
         assertEquals("PNG", data.getFileFormatType().getCode());

openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/translator/ExternalDataTranslatorTest.java

@@ -35,13 +35,13 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.ExperimentPE;
 import ch.systemsx.cisd.openbis.generic.shared.dto.ExperimentTypePE;
 import ch.systemsx.cisd.openbis.generic.shared.dto.ExternalDataPE;
 import ch.systemsx.cisd.openbis.generic.shared.dto.FileFormatTypePE;
-import ch.systemsx.cisd.openbis.generic.shared.dto.SpacePE;
 import ch.systemsx.cisd.openbis.generic.shared.dto.InvalidationPE;
 import ch.systemsx.cisd.openbis.generic.shared.dto.LocatorTypePE;
 import ch.systemsx.cisd.openbis.generic.shared.dto.PersonPE;
 import ch.systemsx.cisd.openbis.generic.shared.dto.ProjectPE;
 import ch.systemsx.cisd.openbis.generic.shared.dto.SamplePE;
 import ch.systemsx.cisd.openbis.generic.shared.dto.SampleTypePE;
+import ch.systemsx.cisd.openbis.generic.shared.dto.SpacePE;
 
 /**
  * @author Franz-Josef Elmer
@@ -122,6 +122,7 @@ public class ExternalDataTranslatorTest extends AssertJUnit
         ExternalData externalData =
                 ExternalDataTranslator.translate(externalDataPE, BASE_INDEX_URL);
 
+        assertEquals(DOWNLOAD_URL, externalData.getDataStore().getHostUrl());
         assertEquals(DOWNLOAD_URL + "/" + DATA_STORE_SERVER_WEB_APPLICATION_NAME, externalData
                 .getDataStore().getDownloadUrl());
         assertEquals("code", externalData.getCode());