BIS-153 / SP-258: Disallow setting an entity a validation script meant for another entity kind.

SVN: 26454

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

@@ -82,7 +82,8 @@ public final class EntityTypeBO extends AbstractBusinessObject implements IEntit
         {
             ScriptPE script = getScriptDAO()
                     .tryFindByName(entityType.getValidationScript().getName());
-            if (script != null)
+
+            if (script != null && entityType.isEntityKind(script.getEntityKind()))
             {
                 return script;
             } else

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

@@ -97,4 +97,10 @@ public class DataSetType extends EntityType
         this.deletionDisallow = deletionDisallow;
     }
 
+    @Override
+    public boolean isEntityKind(EntityKind kind)
+    {
+        return kind == null || kind == EntityKind.DATA_SET;
+    }
+
 }

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

@@ -68,4 +68,9 @@ abstract public class EntityType extends BasicEntityType
             });
         return etpts;
     }
+
+    /**
+     * return true if this entity type is of given kind, or if the kind is null
+     */
+    public abstract boolean isEntityKind(EntityKind kind);
 }

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

@@ -40,4 +40,10 @@ public class ExperimentType extends EntityType
     {
         this.experimentTypePropertyTypes = experimentTypePropertyTypes;
     }
+
+    @Override
+    public boolean isEntityKind(EntityKind kind)
+    {
+        return kind == null || kind == EntityKind.EXPERIMENT;
+    }
 }

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

@@ -53,4 +53,10 @@ public class MaterialType extends EntityType
         this.materialTypePropertyTypes = materialTypePropertyTypes;
     }
 
+    @Override
+    public boolean isEntityKind(EntityKind kind)
+    {
+        return kind == null || kind == EntityKind.MATERIAL;
+    }
+
 }

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

@@ -260,4 +260,10 @@ public final class SampleType extends EntityType implements Serializable
                 allPropertyTypes));
     }
 
+    @Override
+    public boolean isEntityKind(EntityKind kind)
+    {
+        return kind == null || kind == EntityKind.SAMPLE;
+    }
+
 }