SP-45, BIS-21 make some classes serializable for recovery in screening

SVN: 25427

screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/ImageLibraryInfo.java

@@ -16,13 +16,17 @@
 
 package ch.systemsx.cisd.openbis.dss.etl.dto;
 
+import java.io.Serializable;
+
 /**
  * Stores information about the library and its reader which should be used to read the image.
  * 
  * @author Tomasz Pylak
  */
-public class ImageLibraryInfo
+public class ImageLibraryInfo implements Serializable
 {
+    private static final long serialVersionUID = 1L;
+
     // Which image library should be used to read the image?
     private final String name;
 

screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/RelativeImageFile.java

@@ -16,6 +16,8 @@
 
 package ch.systemsx.cisd.openbis.dss.etl.dto;
 
+import java.io.Serializable;
+
 import ch.systemsx.cisd.common.utilities.AbstractHashable;
 import ch.systemsx.cisd.openbis.dss.etl.dto.api.v1.ImageFileInfo;
 import ch.systemsx.cisd.openbis.dss.etl.dto.api.v1.ImageIdentifier;
@@ -25,8 +27,10 @@ import ch.systemsx.cisd.openbis.dss.etl.dto.api.v1.ImageIdentifier;
  * 
  * @author Tomasz Pylak
  */
-public class RelativeImageFile extends AbstractHashable
+public class RelativeImageFile extends AbstractHashable implements Serializable
 {
+    private static final long serialVersionUID = 1L;
+
     private final String imageRelativePath;
 
     private final String imageIDOrNull;

screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/impl/FeatureDefinition.java

@@ -16,6 +16,7 @@
 
 package ch.systemsx.cisd.openbis.dss.etl.dto.api.impl;
 
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -39,8 +40,10 @@ import ch.systemsx.cisd.openbis.plugin.screening.shared.imaging.dataaccess.ImgFe
  * 
  * @author Tomasz Pylak
  */
-public class FeatureDefinition implements IFeatureDefinition
+public class FeatureDefinition implements IFeatureDefinition, Serializable
 {
+    private static final long serialVersionUID = 1L;
+
     private final ImgFeatureDefDTO imgFeatureDefDTO;
 
     private final List<FeatureValuesMap> values;

screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/impl/ImageDataSetStructure.java

@@ -16,6 +16,7 @@
 
 package ch.systemsx.cisd.openbis.dss.etl.dto.api.impl;
 
+import java.io.Serializable;
 import java.util.List;
 
 import ch.systemsx.cisd.common.collections.CollectionUtils;
@@ -33,8 +34,11 @@ import ch.systemsx.cisd.openbis.dss.generic.shared.utils.ToStringUtil;
  * 
  * @author Tomasz Pylak
  */
-public class ImageDataSetStructure
+public class ImageDataSetStructure implements Serializable
 {
+    
+    private static final long serialVersionUID = 1L;
+
     private List<ImageFileInfo> images;
 
     private List<Channel> channels;

screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/impl/ThumbnailsInfo.java

 package ch.systemsx.cisd.openbis.dss.etl.dto.api.impl;
 
+import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
@@ -15,10 +16,14 @@ import ch.systemsx.cisd.openbis.plugin.screening.shared.imaging.dataaccess.Color
  * 
  * @author Tomasz Pylak
  */
-public class ThumbnailsInfo
+public class ThumbnailsInfo implements Serializable
 {
-    public static class PhysicalDatasetInfo
+    private static final long serialVersionUID = 1L;
+
+    public static class PhysicalDatasetInfo implements Serializable
     {
+        private static final long serialVersionUID = 1L;
+
         private final String rootPath;
 
         private int thumbnailsWidth;

screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/Channel.java

 package ch.systemsx.cisd.openbis.dss.etl.dto.api.v1;
 
 import java.awt.Color;
+import java.io.Serializable;
 
 import ch.systemsx.cisd.common.image.WavelengthColor;
 import ch.systemsx.cisd.common.utilities.AbstractHashable;
@@ -14,8 +15,10 @@ import ch.systemsx.cisd.openbis.dss.etl.dto.api.v1.transformations.ImageTransfor
  * 
  * @author Tomasz Pylak
  */
-public final class Channel extends AbstractHashable
+public final class Channel extends AbstractHashable implements Serializable
 {
+    private static final long serialVersionUID = 1L;
+
     private final String code;
 
     private final String label;

screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/ImageFileInfo.java

 package ch.systemsx.cisd.openbis.dss.etl.dto.api.v1;
 
+import java.io.Serializable;
+
 import ch.systemsx.cisd.bds.hcs.Location;
 import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.WellLocation;
 
@@ -8,8 +10,10 @@ import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.WellLocation;
  * 
  * @author Tomasz Pylak
  */
-public final class ImageFileInfo
+public final class ImageFileInfo implements Serializable
 {
+    private static final long serialVersionUID = 1L;
+
     private WellLocation wellLocationOrNull;
 
     private Location tileLocation;

screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/ImageIdentifier.java

@@ -16,6 +16,8 @@
 
 package ch.systemsx.cisd.openbis.dss.etl.dto.api.v1;
 
+import java.io.Serializable;
+
 import ch.systemsx.cisd.imagereaders.ImageID;
 
 /**
@@ -25,8 +27,10 @@ import ch.systemsx.cisd.imagereaders.ImageID;
  * 
  * @author Franz-Josef Elmer
  */
-public class ImageIdentifier implements Comparable<ImageIdentifier>
+public class ImageIdentifier implements Comparable<ImageIdentifier>, Serializable
 {
+    private static final long serialVersionUID = 1L;
+
     public static final ImageIdentifier NULL = new ImageIdentifier(0, 0, 0, 0);
 
     private final int seriesIndex;

screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/ImageStorageConfiguraton.java

@@ -16,6 +16,7 @@
 
 package ch.systemsx.cisd.openbis.dss.etl.dto.api.v1;
 
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -32,8 +33,10 @@ import ch.systemsx.cisd.openbis.dss.etl.dto.ImageLibraryInfo;
  * 
  * @author Tomasz Pylak
  */
-public class ImageStorageConfiguraton extends AbstractHashable
+public class ImageStorageConfiguraton extends AbstractHashable implements Serializable
 {
+    private static final long serialVersionUID = 1L;
+
     /** Returns the default configuration. */
     public static ImageStorageConfiguraton createDefault()
     {

screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/ThumbnailsStorageFormat.java

@@ -18,6 +18,7 @@ package ch.systemsx.cisd.openbis.dss.etl.dto.api.v1;
 
 import java.awt.image.BufferedImage;
 import java.io.OutputStream;
+import java.io.Serializable;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -32,9 +33,11 @@ import ch.systemsx.cisd.openbis.dss.generic.shared.utils.ImageUtil;
  * 
  * @author Tomasz Pylak
  */
-public class ThumbnailsStorageFormat extends AbstractHashable
+public class ThumbnailsStorageFormat extends AbstractHashable implements Serializable
 {
 
+    private static final long serialVersionUID = 1L;
+
     public enum FileFormat
     {
         PNG

screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/transformations/ImageTransformation.java

@@ -16,6 +16,8 @@
 
 package ch.systemsx.cisd.openbis.dss.etl.dto.api.v1.transformations;
 
+import java.io.Serializable;
+
 import ch.systemsx.cisd.base.image.IImageTransformerFactory;
 import ch.systemsx.cisd.openbis.generic.shared.basic.CodeNormalizer;
 
@@ -24,8 +26,11 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.CodeNormalizer;
  * 
  * @author Tomasz Pylak
  */
-public class ImageTransformation
+public class ImageTransformation implements Serializable
 {
+    
+    private static final long serialVersionUID = 1L;
+
     private String code;
 
     private String label;

screening/source/java/ch/systemsx/cisd/openbis/dss/etl/featurevector/FeatureValuesMap.java

@@ -16,6 +16,7 @@
 
 package ch.systemsx.cisd.openbis.dss.etl.featurevector;
 
+import java.io.Serializable;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
@@ -31,8 +32,10 @@ import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.WellLocation;
  * 
  * @author Tomasz Pylak
  */
-public class FeatureValuesMap
+public class FeatureValuesMap implements Serializable
 {
+    private static final long serialVersionUID = 1L;
+
     private final Map<WellLocation, String> valuesMap;
 
     private final Double depthOrNull;

screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/imaging/dataaccess/ImgFeatureDefDTO.java

@@ -16,6 +16,8 @@
 
 package ch.systemsx.cisd.openbis.plugin.screening.shared.imaging.dataaccess;
 
+import java.io.Serializable;
+
 import net.lemnik.eodsql.ResultColumn;
 
 /**
@@ -24,8 +26,10 @@ import net.lemnik.eodsql.ResultColumn;
  * 
  * @author Chandrasekhar Ramakrishnan
  */
-public class ImgFeatureDefDTO extends AbstractImgIdentifiable
+public class ImgFeatureDefDTO extends AbstractImgIdentifiable implements Serializable
 {
+    private static final long serialVersionUID = 1L;
+
     @ResultColumn("LABEL")
     private String label;