diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/DataSetRegistrationAlgorithmRunner.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/DataSetRegistrationAlgorithmRunner.java
index 79c175c3ed05270d9898ad3fc1e912cac1c455fe..9775ded8e6a92afa58aca60a62da8ad49ad257c7 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/DataSetRegistrationAlgorithmRunner.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/DataSetRegistrationAlgorithmRunner.java
@@ -47,13 +47,13 @@ public class DataSetRegistrationAlgorithmRunner
private final IDataSetRegistrationAlgorithmRunnerDelegate delegate;
public DataSetRegistrationAlgorithmRunner(
- TransferredDataSetHandlerDataSetRegistrationAlgorithm registrationHelper)
+ DataSetRegistrationHelper registrationHelper)
{
this(registrationHelper, new NoOpDelegate());
}
public DataSetRegistrationAlgorithmRunner(
- TransferredDataSetHandlerDataSetRegistrationAlgorithm registrationHelper,
+ DataSetRegistrationHelper registrationHelper,
IDataSetRegistrationAlgorithmRunnerDelegate delegate)
{
this(registrationHelper.getRegistrationAlgorithm(), delegate);
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/TransferredDataSetHandlerDataSetRegistrationAlgorithm.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/DataSetRegistrationHelper.java
similarity index 97%
rename from datastore_server/source/java/ch/systemsx/cisd/etlserver/TransferredDataSetHandlerDataSetRegistrationAlgorithm.java
rename to datastore_server/source/java/ch/systemsx/cisd/etlserver/DataSetRegistrationHelper.java
index b939c0a01057266e094b430a9bd46a5ba19bea1b..89bff7aa93e128479b04ac3c67ffcec3a769b28e 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/TransferredDataSetHandlerDataSetRegistrationAlgorithm.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/DataSetRegistrationHelper.java
@@ -40,7 +40,7 @@ import ch.systemsx.cisd.openbis.dss.generic.shared.IEncapsulatedOpenBISService;
import ch.systemsx.cisd.openbis.dss.generic.shared.dto.DataSetInformation;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DatabaseInstance;
-public abstract class TransferredDataSetHandlerDataSetRegistrationAlgorithm implements
+public abstract class DataSetRegistrationHelper implements
DataSetRegistrationAlgorithm.IRollbackDelegate
{
@Private
@@ -63,7 +63,7 @@ public abstract class TransferredDataSetHandlerDataSetRegistrationAlgorithm impl
protected final DataSetRegistrationAlgorithm registrationAlgorithm;
- public TransferredDataSetHandlerDataSetRegistrationAlgorithm(File incomingDataSetFile,
+ public DataSetRegistrationHelper(File incomingDataSetFile,
IDelegatedActionWithResult<Boolean> cleanAftrewardsAction,
IPreRegistrationAction preRegistrationAction,
IPostRegistrationAction postRegistrationAction)
@@ -83,7 +83,7 @@ public abstract class TransferredDataSetHandlerDataSetRegistrationAlgorithm impl
this.incomingDataSetFile = algorithmState.getIncomingDataSetFile();
}
- public TransferredDataSetHandlerDataSetRegistrationAlgorithm(File incomingDataSetFile,
+ public DataSetRegistrationHelper(File incomingDataSetFile,
IDelegatedActionWithResult<Boolean> cleanAftrewardsAction,
IPreRegistrationAction preRegistrationAction,
IPostRegistrationAction postRegistrationAction, IDataSetInApplicationServerRegistrator appServerRegistrator)
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/TransferredDataSetHandler.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/TransferredDataSetHandler.java
index 6ecf4feea80a5d25d0e0e13ed76dbe0f69f8c322..ef7a50a0cccb16d8fef77984e25f98250f5def56 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/TransferredDataSetHandler.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/TransferredDataSetHandler.java
@@ -221,7 +221,7 @@ public final class TransferredDataSetHandler extends AbstractTopLevelDataSetRegi
public List<DataSetInformation> handleDataSet(final File dataSet)
{
- final TransferredDataSetHandlerDataSetRegistrationAlgorithm registrationHelper =
+ final DataSetRegistrationHelper registrationHelper =
createRegistrationHelper(dataSet);
return new DataSetRegistrationAlgorithmRunner(registrationHelper).runAlgorithm();
}
@@ -232,7 +232,7 @@ public final class TransferredDataSetHandler extends AbstractTopLevelDataSetRegi
{
dataSetInformation.setInstanceCode(getHomeDatabaseInstance().getCode());
dataSetInformation.setInstanceUUID(getHomeDatabaseInstance().getUuid());
- final TransferredDataSetHandlerDataSetRegistrationAlgorithm registrationHelper =
+ final DataSetRegistrationHelper registrationHelper =
createRegistrationHelper(dataSet, dataSetInformation, registrator);
return new DataSetRegistrationAlgorithmRunner(registrationHelper).runAlgorithm();
}
@@ -289,7 +289,7 @@ public final class TransferredDataSetHandler extends AbstractTopLevelDataSetRegi
// Helper class
//
- private TransferredDataSetHandlerDataSetRegistrationAlgorithm createRegistrationHelper(File file)
+ private DataSetRegistrationHelper createRegistrationHelper(File file)
{
if (useIsFinishedMarkerFile)
{
@@ -300,7 +300,7 @@ public final class TransferredDataSetHandler extends AbstractTopLevelDataSetRegi
}
}
- private TransferredDataSetHandlerDataSetRegistrationAlgorithm createRegistrationHelper(
+ private DataSetRegistrationHelper createRegistrationHelper(
File dataSet, DataSetInformation dataSetInformation,
DataSetRegistrationAlgorithm.IDataSetInApplicationServerRegistrator registrator)
{
@@ -315,7 +315,7 @@ public final class TransferredDataSetHandler extends AbstractTopLevelDataSetRegi
}
}
- private TransferredDataSetHandlerDataSetRegistrationAlgorithm createRegistrationHelperWithIsFinishedFile(
+ private DataSetRegistrationHelper createRegistrationHelperWithIsFinishedFile(
final File isFinishedFile, final DataSetInformation dsInfo,
DataSetRegistrationAlgorithm.IDataSetInApplicationServerRegistrator registrator)
{
@@ -353,7 +353,7 @@ public final class TransferredDataSetHandler extends AbstractTopLevelDataSetRegi
}
}
- private TransferredDataSetHandlerDataSetRegistrationAlgorithm createRegistrationHelperWithQuietPeriodFilter(
+ private DataSetRegistrationHelper createRegistrationHelperWithQuietPeriodFilter(
File incomingDataSetFile, final DataSetInformation dsInfo,
DataSetRegistrationAlgorithm.IDataSetInApplicationServerRegistrator registrator)
{
@@ -435,7 +435,7 @@ public final class TransferredDataSetHandler extends AbstractTopLevelDataSetRegi
return ok;
}
- private class RegistrationHelper extends TransferredDataSetHandlerDataSetRegistrationAlgorithm
+ private class RegistrationHelper extends DataSetRegistrationHelper
{
RegistrationHelper(TransferredDataSetHandler transferredDataSetHandler,
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/api/v1/PutDataSetExecutor.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/api/v1/PutDataSetExecutor.java
index 541ba1dcb106b5c4759ad228bd9992de537bfadb..de57e604fb1d7631498a7a2be19a14017a946002 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/api/v1/PutDataSetExecutor.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/api/v1/PutDataSetExecutor.java
@@ -52,7 +52,7 @@ import ch.systemsx.cisd.etlserver.IPostRegistrationAction;
import ch.systemsx.cisd.etlserver.IPreRegistrationAction;
import ch.systemsx.cisd.etlserver.IStorageProcessor;
import ch.systemsx.cisd.etlserver.ITypeExtractor;
-import ch.systemsx.cisd.etlserver.TransferredDataSetHandlerDataSetRegistrationAlgorithm;
+import ch.systemsx.cisd.etlserver.DataSetRegistrationHelper;
import ch.systemsx.cisd.etlserver.validation.IDataSetValidator;
import ch.systemsx.cisd.openbis.dss.generic.shared.IEncapsulatedOpenBISService;
import ch.systemsx.cisd.openbis.dss.generic.shared.api.v1.FileInfoDssDTO;
@@ -486,7 +486,7 @@ class PutDataSetExecutor implements IDataSetHandlerRpc
*
* @author Chandrasekhar Ramakrishnan
*/
- private class RegistrationHelper extends TransferredDataSetHandlerDataSetRegistrationAlgorithm
+ private class RegistrationHelper extends DataSetRegistrationHelper
{
/**
* @param service The provider of global state for the data set registration algorithm
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/TransferredDataSetHandlerTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/TransferredDataSetHandlerTest.java
index 6118a43a1a990fdaf6531b9b4a4189a80fe0a8b1..173b9c99a53f4d078474eda569db21389f23290a 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/TransferredDataSetHandlerTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/TransferredDataSetHandlerTest.java
@@ -82,7 +82,7 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.ExperimentIdentifi
* @author Franz-Josef Elmer
*/
@Friend(toClasses =
- { TransferredDataSetHandler.class, TransferredDataSetHandlerDataSetRegistrationAlgorithm.class,
+ { TransferredDataSetHandler.class, DataSetRegistrationHelper.class,
IdentifiedDataStrategy.class, PluginTaskProviders.class,
DssPropertyParametersUtil.class })
public final class TransferredDataSetHandlerTest extends AbstractFileSystemTestCase
@@ -308,7 +308,7 @@ public final class TransferredDataSetHandlerTest extends AbstractFileSystemTestC
private final String createLogMsgOfSuccess(final DataSetInformation dataSet)
{
- return TransferredDataSetHandlerDataSetRegistrationAlgorithm.SUCCESSFULLY_REGISTERED + "Data Set Code::"
+ return DataSetRegistrationHelper.SUCCESSFULLY_REGISTERED + "Data Set Code::"
+ DATA_SET_CODE + ";Data Set Type::" + DATA_SET_TYPE.getCode()
+ ";Experiment Identifier::" + dataSet.getExperimentIdentifier().toString()
+ ";Sample Identifier::" + dataSet.getSampleIdentifier().toString()
@@ -466,7 +466,7 @@ public final class TransferredDataSetHandlerTest extends AbstractFileSystemTestC
final DataSetInformation dataSet, final String dataSetCode, final String recipient)
{
expectations.one(mailClient).sendMessage(
- String.format(TransferredDataSetHandlerDataSetRegistrationAlgorithm.EMAIL_SUBJECT_TEMPLATE, dataSet
+ String.format(DataSetRegistrationHelper.EMAIL_SUBJECT_TEMPLATE, dataSet
.getExperimentIdentifier().getExperimentCode()),
getNotificationEmailContent(dataSet, dataSetCode), null, null, recipient);
}
@@ -698,7 +698,7 @@ public final class TransferredDataSetHandlerTest extends AbstractFileSystemTestC
createLogMsgOfSuccess(dataSetInformation));
final LogMonitoringAppender appender2 =
LogMonitoringAppender.addAppender(LogCategory.NOTIFY, String.format(
- TransferredDataSetHandlerDataSetRegistrationAlgorithm.DATA_SET_STORAGE_FAILURE_TEMPLATE,
+ DataSetRegistrationHelper.DATA_SET_STORAGE_FAILURE_TEMPLATE,
dataSetInformation));
handler.handle(isFinishedFolder);
@@ -756,7 +756,7 @@ public final class TransferredDataSetHandlerTest extends AbstractFileSystemTestC
createLogMsgOfSuccess(dataSetInformation));
final LogMonitoringAppender appender2 =
LogMonitoringAppender.addAppender(LogCategory.NOTIFY, String.format(
- TransferredDataSetHandlerDataSetRegistrationAlgorithm.DATA_SET_REGISTRATION_FAILURE_TEMPLATE,
+ DataSetRegistrationHelper.DATA_SET_REGISTRATION_FAILURE_TEMPLATE,
dataSetInformation));
handler.handle(isFinishedFolder);