LMS-1546, LMS-1584 bugfix: throw exception in case of missing parent dataset

SVN: 16735

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

@@ -26,6 +26,7 @@ import javax.sql.DataSource;
 
 import net.lemnik.eodsql.QueryTool;
 
+import ch.systemsx.cisd.common.exceptions.EnvironmentFailureException;
 import ch.systemsx.cisd.etlserver.plugins.IMigrator;
 import ch.systemsx.cisd.openbis.dss.etl.ScreeningContainerDatasetInfo;
 import ch.systemsx.cisd.openbis.dss.generic.shared.IEncapsulatedOpenBISService;
@@ -143,7 +144,12 @@ public abstract class AbstractFeatureVectorMigrator implements IMigrator
             for (String dataSetCode : parentDataSetCodes)
             {
                 ExternalData externalData = openBisService.tryGetDataSetForServer(dataSetCode);
-                if (externalData != null && externalData.getSample() != null)
+                if (externalData == null)
+                {
+                    throw new EnvironmentFailureException(
+                            "Cannot find a parent dataset in openBIS: " + dataSetCode);
+                }
+                if (externalData.getSample() != null)
                 {
                     sampleId = SampleIdentifierFactory.parse(externalData.getSampleIdentifier());
                     break;

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

@@ -27,6 +27,7 @@ import javax.sql.DataSource;
 import net.lemnik.eodsql.QueryTool;
 
 import ch.systemsx.cisd.base.exceptions.IOExceptionUnchecked;
+import ch.systemsx.cisd.common.exceptions.UserFailureException;
 import ch.systemsx.cisd.common.mail.IMailClient;
 import ch.systemsx.cisd.etlserver.AbstractDelegatingStorageProcessor;
 import ch.systemsx.cisd.etlserver.ITypeExtractor;
@@ -128,6 +129,11 @@ public class FeatureVectorStorageProcessor extends AbstractDelegatingStorageProc
             for (String dataSetCode : parentDataSetCodes)
             {
                 ExternalData externalData = openBisService.tryGetDataSetForServer(dataSetCode);
+                if (externalData == null)
+                {
+                    throw new UserFailureException("Cannot find a parent dataset in openBIS: "
+                            + dataSetCode);
+                }
                 if (externalData.getSample() != null)
                 {
                     sampleOrNull = externalData.getSample();