fixed direct getter invocation on samplePEs id

SVN: 15685

screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/logic/GenePlateLocationsLoader.java

@@ -39,11 +39,12 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.EntityReference;
 import ch.systemsx.cisd.openbis.generic.shared.dto.ExternalDataPE;
 import ch.systemsx.cisd.openbis.generic.shared.dto.Session;
 import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.ExperimentIdentifier;
+import ch.systemsx.cisd.openbis.generic.shared.util.HibernateUtils;
 import ch.systemsx.cisd.openbis.plugin.screening.server.IScreeningBusinessObjectFactory;
 import ch.systemsx.cisd.openbis.plugin.screening.server.dataaccess.IScreeningQuery;
+import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.DatasetImagesReference;
 import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.DatasetReference;
 import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.PlateImageParameters;
-import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.DatasetImagesReference;
 import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.ScreeningConstants;
 import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.WellContent;
 import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.WellLocation;
@@ -133,7 +134,8 @@ public class GenePlateLocationsLoader
         Map<Long, List<ExternalDataPE>> map = new HashMap<Long, List<ExternalDataPE>>();
         for (ExternalDataPE dataset : datasets)
         {
-            Long sampleId = dataset.tryGetSample().getId();
+            Long sampleId = HibernateUtils.getId(dataset.tryGetSample());
+
             List<ExternalDataPE> plateDatasets = map.get(sampleId);
             if (plateDatasets == null)
             {
@@ -156,7 +158,8 @@ public class GenePlateLocationsLoader
         // NOTE: assumes that all datasets are from the same datastore
         String datastoreCode = imageDatasets.get(0).getDataStore().getCode();
         List<PlateImageParameters> imageParameters =
-                DatasetReportsLoader.loadPlateImageParameters(datasetCodes, datastoreCode, externalDataTable);
+                DatasetReportsLoader.loadPlateImageParameters(datasetCodes, datastoreCode,
+                        externalDataTable);
         return asDatasetToParamsMap(imageParameters);
     }
 

screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/logic/PlateContentLoader.java

@@ -38,6 +38,7 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.ExternalDataPE;
 import ch.systemsx.cisd.openbis.generic.shared.dto.SamplePE;
 import ch.systemsx.cisd.openbis.generic.shared.dto.Session;
 import ch.systemsx.cisd.openbis.generic.shared.translator.SampleTranslator;
+import ch.systemsx.cisd.openbis.generic.shared.util.HibernateUtils;
 import ch.systemsx.cisd.openbis.plugin.screening.server.IScreeningBusinessObjectFactory;
 import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.DatasetImagesReference;
 import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.DatasetReference;
@@ -120,7 +121,7 @@ public class PlateContentLoader
             throw UserFailureException.fromTemplate("Dataset '%s' has no sample connected.",
                     externalData.getCode());
         }
-        List<WellMetadata> wells = loadWells(new TechId(plate.getId()));
+        List<WellMetadata> wells = loadWells(new TechId(HibernateUtils.getId(plate)));
         DatasetImagesReference datasetImagesReference =
                 loadImages(createExternalDataTable(), externalData);
         return new PlateImages(translate(plate), wells, datasetImagesReference);
@@ -155,7 +156,8 @@ public class PlateContentLoader
                 ScreeningUtils.filterImageAnalysisDatasets(datasets);
         List<String> datasetCodes = extractCodes(analysisDatasets);
         String dataStoreCode = extractDataStoreCode(analysisDatasets);
-        return DatasetReportsLoader.loadAnalysisResults(datasetCodes, dataStoreCode, externalDataTable);
+        return DatasetReportsLoader.loadAnalysisResults(datasetCodes, dataStoreCode,
+                externalDataTable);
     }
 
     private List<PlateSingleImageReference> loadAllImages(TechId plateId)
@@ -170,7 +172,8 @@ public class PlateContentLoader
             // NOTE: we assume that all datasets for one plate come from the same datastore
             String dataStoreCode = extractDataStoreCode(imageDatasets);
             imagePaths =
-                    DatasetReportsLoader.loadPlateImages(datasetCodes, dataStoreCode, externalDataTable);
+                    DatasetReportsLoader.loadPlateImages(datasetCodes, dataStoreCode,
+                            externalDataTable);
         }
         return imagePaths;
     }