From f1b5ad411b809592564d134673539dabb86da748 Mon Sep 17 00:00:00 2001 From: felmer <felmer> Date: Mon, 25 Mar 2013 09:14:12 +0000 Subject: [PATCH] SP-568, BIS-365: DefaultDropbox extends AbstractJavaDataSetRegistrationDropboxV2 instead of test class JavaAllHooks SVN: 28680 --- .../etlserver/registrator/DefaultDropbox.java | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/DefaultDropbox.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/DefaultDropbox.java index 25af1ea43d0..6670d41ffb5 100644 --- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/DefaultDropbox.java +++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/DefaultDropbox.java @@ -16,10 +16,9 @@ package ch.systemsx.cisd.etlserver.registrator; -import ch.systemsx.cisd.common.exceptions.NotImplementedException; +import ch.systemsx.cisd.etlserver.registrator.api.v2.AbstractJavaDataSetRegistrationDropboxV2; import ch.systemsx.cisd.etlserver.registrator.api.v2.IDataSet; import ch.systemsx.cisd.etlserver.registrator.api.v2.IDataSetRegistrationTransactionV2; -import ch.systemsx.cisd.etlserver.registrator.api.v2.IJavaDataSetRegistrationDropboxV2; import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v2.ISampleImmutable; /** @@ -27,7 +26,7 @@ import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v2.ISampleImmuta * * @author Franz-Josef Elmer */ -public class DefaultDropbox extends JavaAllHooks implements IJavaDataSetRegistrationDropboxV2 +public class DefaultDropbox extends AbstractJavaDataSetRegistrationDropboxV2 { private static final String SAMPLE_IDENTIFIER = "/DEFAULT/DEFAULT"; @@ -51,18 +50,4 @@ public class DefaultDropbox extends JavaAllHooks implements IJavaDataSetRegistra } transaction.moveFile(transaction.getIncoming().getAbsolutePath(), dataSet); } - - @Override - public boolean isRetryFunctionDefined() - { - return false; - } - - @Override - public boolean shouldRetryProcessing(DataSetRegistrationContext context, Exception problem) - throws NotImplementedException - { - throw new NotImplementedException(); - } - } -- GitLab