From 8810fd971f6b263cc4baa557e6ea0578597bee99 Mon Sep 17 00:00:00 2001
From: jakubs <jakubs>
Date: Wed, 27 Jun 2012 12:13:24 +0000
Subject: [PATCH] SP-169 BIS-90 rename container dataset storage algorithm to
AbstractNoFileDataSetStorageAlgorithm
SVN: 25892
---
...AbstractNoFileDataSetStorageAlgorithm.java} | 18 +++++-------------
.../DataSetRegistrationService.java | 2 +-
...taSetStoragePrecommitRecoveryAlgorithm.java | 4 ++--
.../DataSetStorageStoredRecoveryAlgorithm.java | 4 ++--
4 files changed, 10 insertions(+), 18 deletions(-)
rename datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/{ContainerDataSetStorageAlgorithm.java => AbstractNoFileDataSetStorageAlgorithm.java} (88%)
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/ContainerDataSetStorageAlgorithm.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/AbstractNoFileDataSetStorageAlgorithm.java
similarity index 88%
rename from datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/ContainerDataSetStorageAlgorithm.java
rename to datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/AbstractNoFileDataSetStorageAlgorithm.java
index 4c948fdaad8..6705dd5e063 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/ContainerDataSetStorageAlgorithm.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/AbstractNoFileDataSetStorageAlgorithm.java
@@ -24,13 +24,11 @@ import ch.systemsx.cisd.etlserver.IDataStoreStrategy;
import ch.systemsx.cisd.etlserver.IStorageProcessorTransactional;
import ch.systemsx.cisd.etlserver.IStorageProcessorTransactional.IStorageProcessorTransaction;
import ch.systemsx.cisd.etlserver.NullStorageProcessorTransaction;
-import ch.systemsx.cisd.etlserver.registrator.api.v1.impl.ConversionUtils;
import ch.systemsx.cisd.etlserver.registrator.recovery.DataSetStoragePrecommitRecoveryAlgorithm;
import ch.systemsx.cisd.etlserver.registrator.recovery.DataSetStorageRecoveryAlgorithm;
import ch.systemsx.cisd.etlserver.registrator.recovery.DataSetStorageStoredRecoveryAlgorithm;
import ch.systemsx.cisd.etlserver.validation.IDataSetValidator;
import ch.systemsx.cisd.openbis.dss.generic.shared.dto.DataSetInformation;
-import ch.systemsx.cisd.openbis.generic.shared.dto.NewExternalData;
/**
* An implementation of the storage algorithm that registers data sets without file contents. This
@@ -38,7 +36,7 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.NewExternalData;
*
* @author Chandrasekhar Ramakrishnan
*/
-public class ContainerDataSetStorageAlgorithm<T extends DataSetInformation> extends
+public abstract class AbstractNoFileDataSetStorageAlgorithm<T extends DataSetInformation> extends
DataSetStorageAlgorithm<T>
{
@@ -53,7 +51,7 @@ public class ContainerDataSetStorageAlgorithm<T extends DataSetInformation> exte
* @param mailClient
* @param stagingDirectory
*/
- public ContainerDataSetStorageAlgorithm(File incomingDataSetFile,
+ public AbstractNoFileDataSetStorageAlgorithm(File incomingDataSetFile,
DataSetRegistrationDetails<? extends T> registrationDetails,
IDataStoreStrategy dataStoreStrategy, IStorageProcessorTransactional storageProcessor,
IDataSetValidator dataSetValidator, String dataStoreCode,
@@ -68,7 +66,7 @@ public class ContainerDataSetStorageAlgorithm<T extends DataSetInformation> exte
/**
* Creates algorithm from a recovery algorithm.
*/
- public ContainerDataSetStorageAlgorithm(IDataStoreStrategy dataStoreStrategy,
+ public AbstractNoFileDataSetStorageAlgorithm(IDataStoreStrategy dataStoreStrategy,
IStorageProcessorTransactional storageProcessor, IFileOperations fileOperations,
IMailClient mailClient, DataSetStorageRecoveryAlgorithm<T> recoveryAlgorithm)
{
@@ -118,13 +116,6 @@ public class ContainerDataSetStorageAlgorithm<T extends DataSetInformation> exte
// do nothing
}
- @Override
- public NewExternalData createExternalData()
- {
- return ConversionUtils.convertToNewContainerDataSet(getRegistrationDetails(),
- getDataStoreCode());
- }
-
@Override
public String getSuccessRegistrationMessage()
{
@@ -136,7 +127,8 @@ public class ContainerDataSetStorageAlgorithm<T extends DataSetInformation> exte
@Override
public String getFailureRegistrationMessage()
{
- return "Error trying to register container data set '" + getDataSetInformation().toString()
+ return "Error trying to register no-file-contents data set '"
+ + getDataSetInformation().toString()
+ "'.";
}
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/DataSetRegistrationService.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/DataSetRegistrationService.java
index c575b055712..4c6dfa6b895 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/DataSetRegistrationService.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/DataSetRegistrationService.java
@@ -336,7 +336,7 @@ public class DataSetRegistrationService<T extends DataSetInformation> implements
+ dataSetInformation);
}
algorithm =
- new ContainerDataSetStorageAlgorithm<T>(dataSetFile, dataSetDetails, strategy,
+ new AbstractNoFileDataSetStorageAlgorithm<T>(dataSetFile, dataSetDetails, strategy,
registratorContext.getStorageProcessor(),
globalContext.getDataSetValidator(), globalContext.getDssCode(),
registratorContext.getFileOperations(), globalContext.getMailClient(),
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/recovery/DataSetStoragePrecommitRecoveryAlgorithm.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/recovery/DataSetStoragePrecommitRecoveryAlgorithm.java
index d07b77d512d..5f23841b9a1 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/recovery/DataSetStoragePrecommitRecoveryAlgorithm.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/recovery/DataSetStoragePrecommitRecoveryAlgorithm.java
@@ -26,7 +26,7 @@ import ch.systemsx.cisd.etlserver.IDataStoreStrategy;
import ch.systemsx.cisd.etlserver.IStorageProcessorTransactional;
import ch.systemsx.cisd.etlserver.IStorageProcessorTransactional.IStorageProcessorTransaction;
import ch.systemsx.cisd.etlserver.registrator.AbstractOmniscientTopLevelDataSetRegistrator.OmniscientTopLevelDataSetRegistratorState;
-import ch.systemsx.cisd.etlserver.registrator.ContainerDataSetStorageAlgorithm;
+import ch.systemsx.cisd.etlserver.registrator.AbstractNoFileDataSetStorageAlgorithm;
import ch.systemsx.cisd.etlserver.registrator.DataSetStorageAlgorithm;
import ch.systemsx.cisd.etlserver.registrator.DataSetStorageAlgorithm.DataSetStoragePaths;
import ch.systemsx.cisd.openbis.dss.generic.shared.dto.DataSetInformation;
@@ -100,7 +100,7 @@ public class DataSetStoragePrecommitRecoveryAlgorithm<T extends DataSetInformati
if (isContainer)
{
- return new ContainerDataSetStorageAlgorithm<T>(dataStoreStrategy, storageProcessor,
+ return new AbstractNoFileDataSetStorageAlgorithm<T>(dataStoreStrategy, storageProcessor,
fileOperations, mailClient, recoveryAlgorithm);
} else
{
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/recovery/DataSetStorageStoredRecoveryAlgorithm.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/recovery/DataSetStorageStoredRecoveryAlgorithm.java
index 663587ba028..d2649add44b 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/recovery/DataSetStorageStoredRecoveryAlgorithm.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/recovery/DataSetStorageStoredRecoveryAlgorithm.java
@@ -25,7 +25,7 @@ import ch.systemsx.cisd.etlserver.DataStoreStrategyKey;
import ch.systemsx.cisd.etlserver.IDataStoreStrategy;
import ch.systemsx.cisd.etlserver.IStorageProcessorTransactional;
import ch.systemsx.cisd.etlserver.registrator.AbstractOmniscientTopLevelDataSetRegistrator.OmniscientTopLevelDataSetRegistratorState;
-import ch.systemsx.cisd.etlserver.registrator.ContainerDataSetStorageAlgorithm;
+import ch.systemsx.cisd.etlserver.registrator.AbstractNoFileDataSetStorageAlgorithm;
import ch.systemsx.cisd.etlserver.registrator.DataSetStorageAlgorithm;
import ch.systemsx.cisd.etlserver.registrator.DataSetStorageAlgorithm.DataSetStoragePaths;
import ch.systemsx.cisd.openbis.dss.generic.shared.dto.DataSetInformation;
@@ -83,7 +83,7 @@ public class DataSetStorageStoredRecoveryAlgorithm<T extends DataSetInformation>
if (isContainer)
{
- return new ContainerDataSetStorageAlgorithm<T>(dataStoreStrategy, storageProcessor,
+ return new AbstractNoFileDataSetStorageAlgorithm<T>(dataStoreStrategy, storageProcessor,
fileOperations, mailClient, recoveryAlgorithm);
} else
{
--
GitLab