BIS-153 SP-257 add validation script to master data immutable dtos

SVN: 26448

openbis/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IEntityType.java

@@ -16,6 +16,7 @@
 
 package ch.systemsx.cisd.openbis.generic.server.jython.api.v1;
 
+
 /**
  * The superinterface for all entity types (as opposed to property types).
  * 
@@ -28,4 +29,9 @@ public interface IEntityType extends IAbstractType
      * Return the entity kind.
      */
     EntityKind getEntityKind();
+
+    /**
+     * Return the validation script for this type
+     */
+    IScriptImmutable getValidationScript();
 }

openbis/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IScriptImmutable.java

@@ -21,7 +21,7 @@ package ch.systemsx.cisd.openbis.generic.server.jython.api.v1;
  * 
  * @author Manuel Kohler
  */
-public interface IScriptImmutable extends IEntityType
+public interface IScriptImmutable extends IAbstractType
 {
     /**
      * Get the entity of the script. The values can be EXPERIMENT, SAMPLE, DATA_SET, MATERIAL.

openbis/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/DataSetTypeImmutable.java

@@ -18,6 +18,7 @@ package ch.systemsx.cisd.openbis.generic.server.jython.api.v1.impl;
 
 import ch.systemsx.cisd.openbis.generic.server.jython.api.v1.EntityKind;
 import ch.systemsx.cisd.openbis.generic.server.jython.api.v1.IDataSetTypeImmutable;
+import ch.systemsx.cisd.openbis.generic.server.jython.api.v1.IScriptImmutable;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DataSetKind;
 
 /**
@@ -98,4 +99,10 @@ public class DataSetTypeImmutable implements IDataSetTypeImmutable
     {
         return getDataSetType().getMainDataSetPath();
     }
+
+    @Override
+    public IScriptImmutable getValidationScript()
+    {
+        return new ScriptImmutable(getDataSetType().getValidationScript());
+    }
 }

openbis/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/ExperimentTypeImmutable.java

@@ -18,6 +18,7 @@ package ch.systemsx.cisd.openbis.generic.server.jython.api.v1.impl;
 
 import ch.systemsx.cisd.openbis.generic.server.jython.api.v1.EntityKind;
 import ch.systemsx.cisd.openbis.generic.server.jython.api.v1.IExperimentTypeImmutable;
+import ch.systemsx.cisd.openbis.generic.server.jython.api.v1.IScriptImmutable;
 
 /**
  * @author Kaloyan Enimanev
@@ -61,4 +62,9 @@ public class ExperimentTypeImmutable implements IExperimentTypeImmutable
         return EntityKind.EXPERIMENT;
     }
 
+    @Override
+    public IScriptImmutable getValidationScript()
+    {
+        return new ScriptImmutable(getExperimentType().getValidationScript());
+    }
 }

openbis/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/MaterialTypeImmutable.java

@@ -18,6 +18,7 @@ package ch.systemsx.cisd.openbis.generic.server.jython.api.v1.impl;
 
 import ch.systemsx.cisd.openbis.generic.server.jython.api.v1.EntityKind;
 import ch.systemsx.cisd.openbis.generic.server.jython.api.v1.IMaterialTypeImmutable;
+import ch.systemsx.cisd.openbis.generic.server.jython.api.v1.IScriptImmutable;
 
 /**
  * @author Kaloyan Enimanev
@@ -62,4 +63,9 @@ public class MaterialTypeImmutable implements IMaterialTypeImmutable
         return EntityKind.MATERIAL;
     }
 
+    @Override
+    public IScriptImmutable getValidationScript()
+    {
+        return new ScriptImmutable(getMaterialType().getValidationScript());
+    }
 }

openbis/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/SampleTypeImmutable.java

@@ -18,6 +18,7 @@ package ch.systemsx.cisd.openbis.generic.server.jython.api.v1.impl;
 
 import ch.systemsx.cisd.openbis.generic.server.jython.api.v1.EntityKind;
 import ch.systemsx.cisd.openbis.generic.server.jython.api.v1.ISampleTypeImmutable;
+import ch.systemsx.cisd.openbis.generic.server.jython.api.v1.IScriptImmutable;
 
 /**
  * @author Kaloyan Enimanev
@@ -101,4 +102,10 @@ public class SampleTypeImmutable implements ISampleTypeImmutable
     {
         return EntityKind.SAMPLE;
     }
+
+    @Override
+    public IScriptImmutable getValidationScript()
+    {
+        return new ScriptImmutable(getSampleType().getValidationScript());
+    }
 }

openbis/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/ScriptImmutable.java

@@ -16,7 +16,6 @@
 
 package ch.systemsx.cisd.openbis.generic.server.jython.api.v1.impl;
 
-import ch.systemsx.cisd.openbis.generic.server.jython.api.v1.EntityKind;
 import ch.systemsx.cisd.openbis.generic.server.jython.api.v1.IScriptImmutable;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DatabaseInstance;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Script;
@@ -105,11 +104,4 @@ public class ScriptImmutable implements IScriptImmutable
         return script.getName();
     }
 
-    @Override
-    public EntityKind getEntityKind()
-    {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
 }