From 038af613d7b9e3615aa9cf38eb475c2fb2ab308d Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Thu, 9 Apr 2009 06:24:46 +0000
Subject: [PATCH] LMS-835 I*TypeExtractor renamed to ITypeExtractor and one
method renamed too. service.properties cleaned up.
SVN: 10642
---
datastore_server/dist/etc/service.properties | 25 -------------------
datastore_server/etc/service.properties | 25 -------------------
.../cisd/etlserver/BDSStorageProcessor.java | 6 ++---
.../etlserver/DefaultStorageProcessor.java | 2 +-
.../cisd/etlserver/ETLServerPlugin.java | 6 ++---
.../cisd/etlserver/IETLServerPlugin.java | 2 +-
.../cisd/etlserver/IStorageProcessor.java | 6 ++---
...TypeExtractor.java => ITypeExtractor.java} | 8 +++---
.../PropertiesBasedETLServerPlugin.java | 8 +++---
.../cisd/etlserver/SimpleTypeExtractor.java | 15 ++++++-----
.../etlserver/TransferredDataSetHandler.java | 12 ++++-----
.../server/EncapsulatedOpenBISService.java | 11 ++++----
.../shared/IEncapsulatedOpenBISService.java | 2 +-
.../etlserver/BDSStorageProcessorTest.java | 2 +-
.../DefaultStorageProcessorTest.java | 6 ++---
.../etlserver/SimpleTypeExtractorTest.java | 6 ++---
.../TransferredDataSetHandlerTest.java | 8 +++---
.../EncapsulatedOpenBISServiceTest.java | 2 +-
18 files changed, 49 insertions(+), 103 deletions(-)
rename datastore_server/source/java/ch/systemsx/cisd/etlserver/{IProcessorIDAndDataTypeExtractor.java => ITypeExtractor.java} (87%)
diff --git a/datastore_server/dist/etc/service.properties b/datastore_server/dist/etc/service.properties
index 7db8aa918b6..074cf1ee48c 100644
--- a/datastore_server/dist/etc/service.properties
+++ b/datastore_server/dist/etc/service.properties
@@ -63,30 +63,6 @@ failure-interval = 10
# Globally used separator character which separates entities in a data set file name
data-set-file-name-entity-separator = _
-# Prefixes for processing paths for all procedure types.
-# default-prefix-for-absolute-paths is the key for paths starting with '/'.
-# default-prefix-for-relative-paths is the key for paths not starting with '/'.
-#
-default-prefix-for-absolute-paths =
-
-# Processors of processing instructions.
-#
-# processors: comma separated list of procedure type codes
-# processor.<procedure type code>.prefix-for-absolute-paths: Key for a processing path starting with '/'.
-# processor.<procedure type code>.prefix-for-relative-paths: Key for a processing path not starting with '/'.
-# processor.<procedure type code>.parameters-file: Name of the file containing the processing parameters.
-# processor.<procedure type code>.finished-file-template: Name of the marker file which finishes processing.
-
-processors = DATA_ACQUISITION
-processor.DATA_ACQUISITION.prefix-for-absolute-paths = ${default-prefix-for-absolute-paths}
-processor.DATA_ACQUISITION.prefix-for-relative-paths = data/processing
-processor.DATA_ACQUISITION.parameters-file = parameters
-processor.DATA_ACQUISITION.data-set-code-prefix-glue = ${data-set-file-name-entity-separator}
-processor.DATA_ACQUISITION.finished-file-template = .MARKER_is_finished_{0}
-# Can be one of PROPRIETARY (the data as acquired from the measurement device)
-# or BDS_DIRECTORY (the data in BDS format in a directory container).
-processor.DATA_ACQUISITION.input-storage-format = PROPRIETARY
-
# Comma separated names of processing threads. Each thread should have configuration properties prefixed with its name.
# E.g. 'code-extractor' property for the thread 'my-etl' should be specified as 'my-etl.code-extractor'
inputs=main-thread
@@ -113,7 +89,6 @@ main-thread.type-extractor = ch.systemsx.cisd.etlserver.SimpleTypeExtractor
main-thread.type-extractor.file-format-type = TIFF
main-thread.type-extractor.locator-type = RELATIVE_LOCATION
main-thread.type-extractor.data-set-type = HCS_IMAGE
-main-thread.type-extractor.processor-id = DATA_ACQUISITION
main-thread.type-extractor.is-measured = true
# Location of file containing data set properties
#main-thread.type-extractor.data-set-properties-file = etc/data-set.properties
diff --git a/datastore_server/etc/service.properties b/datastore_server/etc/service.properties
index a557580d5f2..ef18d20926c 100644
--- a/datastore_server/etc/service.properties
+++ b/datastore_server/etc/service.properties
@@ -58,31 +58,6 @@ password = doesnotmatter
# Globally used separator character which separates entities in a data set file name
data-set-file-name-entity-separator = _
-# Prefixes for processing paths for all procedure types.
-# default-prefix-for-absolute-paths is the key for paths starting with '/'.
-# default-prefix-for-relative-paths is the key for paths not starting with '/'.
-#
-default-prefix-for-absolute-paths =
-
-# Processors of processing instructions.
-#
-# processors: comma separated list of procedure type codes
-# processor.<procedure type code>.prefix-for-absolute-paths: Key for a processing path starting with '/'.
-# processor.<procedure type code>.prefix-for-relative-paths: Key for a processing path not starting with '/'.
-# processor.<procedure type code>.parameters-file: Name of the file containing the processing parameters.
-# processor.<procedure type code>.finished-file-template: Name of the marker file which finishes processing.
-
-processors = DATA_ACQUISITION
-processor.DATA_ACQUISITION.prefix-for-absolute-paths = ${default-prefix-for-absolute-paths}
-processor.DATA_ACQUISITION.prefix-for-relative-paths = targets/processing
-processor.DATA_ACQUISITION.parameters-file = parameters
-processor.DATA_ACQUISITION.data-set-code-prefix-glue = ${data-set-file-name-entity-separator}
-processor.DATA_ACQUISITION.finished-file-template = .MARKER_is_finished_{0}
-processor.DATA_ACQUISITION.input-storage-format = BDS_DIRECTORY
-# time after which the copy of a single file for processing should complete.
-# If that will not happen, operation will be terminated and relaunched.
-processor.DATA_ACQUISITION.data-copy-timeout = 10
-
# Comma separated names of processing threads. Each thread should have configuration properties prefixed with its name.
# E.g. 'code-extractor' property for the thread 'my-etl' should be specified as 'my-etl.code-extractor'
inputs=main-thread
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/BDSStorageProcessor.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/BDSStorageProcessor.java
index 56109c9c21b..dd3cd01de39 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/BDSStorageProcessor.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/BDSStorageProcessor.java
@@ -243,7 +243,7 @@ public final class BDSStorageProcessor extends AbstractStorageProcessor implemen
private final IDataStructureV1_1 createDataStructure(final ExperimentPE experiment,
final DataSetInformation dataSetInformation,
- final IProcessorIDAndDataTypeExtractor typeExtractor, final File incomingDataSetPath,
+ final ITypeExtractor typeExtractor, final File incomingDataSetPath,
final File rootDir)
{
final FileStorage storage = new FileStorage(rootDir);
@@ -293,7 +293,7 @@ public final class BDSStorageProcessor extends AbstractStorageProcessor implemen
}
private final static DataSet createDataSet(final DataSetInformation dataSetInformation,
- final IProcessorIDAndDataTypeExtractor typeExtractor, final File incomingDataSetPath)
+ final ITypeExtractor typeExtractor, final File incomingDataSetPath)
{
final String dataSetCode = dataSetInformation.getDataSetCode();
final String parentDataSetCode = dataSetInformation.getParentDataSetCode();
@@ -416,7 +416,7 @@ public final class BDSStorageProcessor extends AbstractStorageProcessor implemen
public final File storeData(final ExperimentPE experiment,
final DataSetInformation dataSetInformation,
- final IProcessorIDAndDataTypeExtractor typeExtractor, final IMailClient mailClient,
+ final ITypeExtractor typeExtractor, final IMailClient mailClient,
final File incomingDataSetDirectory, final File rootDirectory)
{
checkDataSetInformation(dataSetInformation);
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/DefaultStorageProcessor.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/DefaultStorageProcessor.java
index 8023f69b372..98508249e74 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/DefaultStorageProcessor.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/DefaultStorageProcessor.java
@@ -47,7 +47,7 @@ public class DefaultStorageProcessor extends AbstractStorageProcessor
public final File storeData(final ExperimentPE experiment,
final DataSetInformation dataSetInformation,
- final IProcessorIDAndDataTypeExtractor typeExtractor, final IMailClient mailClient,
+ final ITypeExtractor typeExtractor, final IMailClient mailClient,
final File incomingDataSetDirectory, final File rootDir)
{
checkParameters(incomingDataSetDirectory, rootDir);
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/ETLServerPlugin.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/ETLServerPlugin.java
index 76508fecaef..c8d48f777af 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/ETLServerPlugin.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/ETLServerPlugin.java
@@ -26,7 +26,7 @@ public class ETLServerPlugin implements IETLServerPlugin
{
private final IDataSetInfoExtractor codeExtractor;
- private final IProcessorIDAndDataTypeExtractor typeExtractor;
+ private final ITypeExtractor typeExtractor;
private final IStorageProcessor storageProcessor;
@@ -34,7 +34,7 @@ public class ETLServerPlugin implements IETLServerPlugin
* Creates an instance with the specified extractors.
*/
public ETLServerPlugin(final IDataSetInfoExtractor codeExtractor,
- final IProcessorIDAndDataTypeExtractor typeExtractor,
+ final ITypeExtractor typeExtractor,
final IStorageProcessor storageProcessor)
{
assert codeExtractor != null : "Missing code extractor";
@@ -55,7 +55,7 @@ public class ETLServerPlugin implements IETLServerPlugin
return codeExtractor;
}
- public final IProcessorIDAndDataTypeExtractor getTypeExtractor()
+ public final ITypeExtractor getTypeExtractor()
{
return typeExtractor;
}
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/IETLServerPlugin.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/IETLServerPlugin.java
index a55599010c6..01a62ed546a 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/IETLServerPlugin.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/IETLServerPlugin.java
@@ -32,7 +32,7 @@ public interface IETLServerPlugin
/**
* Returns the procedure and data type extractor.
*/
- public IProcessorIDAndDataTypeExtractor getTypeExtractor();
+ public ITypeExtractor getTypeExtractor();
/**
* Returns the {@link IStorageProcessor} implementation.
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/IStorageProcessor.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/IStorageProcessor.java
index 04d92cb74ec..a3718e6f4fd 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/IStorageProcessor.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/IStorageProcessor.java
@@ -48,7 +48,7 @@ public interface IStorageProcessor extends IStoreRootDirectoryHolder
*
* @param experiment information about the related experiment.
* @param dataSetInformation Information about the data set.
- * @param typeExtractor the {@link IProcessorIDAndDataTypeExtractor} implementation.
+ * @param typeExtractor the {@link ITypeExtractor} implementation.
* @param mailClient mail client.
* @param incomingDataSetDirectory folder to store. Do not remove it after the implementation
* has finished processing. {@link TransferredDataSetHandler} takes care of this.
@@ -59,12 +59,12 @@ public interface IStorageProcessor extends IStoreRootDirectoryHolder
*/
public File storeData(final ExperimentPE experiment,
final DataSetInformation dataSetInformation,
- final IProcessorIDAndDataTypeExtractor typeExtractor, final IMailClient mailClient,
+ final ITypeExtractor typeExtractor, final IMailClient mailClient,
final File incomingDataSetDirectory, final File rootDir);
/**
* Performs a rollback of
- * {@link #storeData(ExperimentPE, DataSetInformation, IProcessorIDAndDataTypeExtractor, IMailClient, File, File)}
+ * {@link #storeData(ExperimentPE, DataSetInformation, ITypeExtractor, IMailClient, File, File)}
* The data created in <code>directory</code> will also be removed.
* <p>
* Call to this method is safe as implementations should try/catch exceptions that could occur
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/IProcessorIDAndDataTypeExtractor.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/ITypeExtractor.java
similarity index 87%
rename from datastore_server/source/java/ch/systemsx/cisd/etlserver/IProcessorIDAndDataTypeExtractor.java
rename to datastore_server/source/java/ch/systemsx/cisd/etlserver/ITypeExtractor.java
index 4c938eeccd1..43a85cad1a5 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/IProcessorIDAndDataTypeExtractor.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/ITypeExtractor.java
@@ -23,11 +23,11 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.FileFormatType;
import ch.systemsx.cisd.openbis.generic.shared.dto.LocatorType;
/**
- * Extractor for processor ID, data set, file format, and locator type.
+ * Extractor for processor, data set, file format, and locator type.
*
* @author Franz-Josef Elmer
*/
-public interface IProcessorIDAndDataTypeExtractor
+public interface ITypeExtractor
{
/** Properties key prefix for the type extractor. */
public static final String TYPE_EXTRACTOR_KEY = "type-extractor";
@@ -38,9 +38,9 @@ public interface IProcessorIDAndDataTypeExtractor
public boolean isMeasuredData(File incomingDataSetPath);
/**
- * Returns the ID of the {@link IProcessor} to be used.
+ * Returns the type of the {@link IProcessor} to be used.
*/
- public String getProcessorID(File incomingDataSetPath);
+ public String getProcessorType(File incomingDataSetPath);
/**
* Gets the data set type from the specified path of the incoming data set.
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/PropertiesBasedETLServerPlugin.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/PropertiesBasedETLServerPlugin.java
index c38a9c36232..22de666a6b3 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/PropertiesBasedETLServerPlugin.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/PropertiesBasedETLServerPlugin.java
@@ -17,7 +17,7 @@
package ch.systemsx.cisd.etlserver;
import static ch.systemsx.cisd.etlserver.IDataSetInfoExtractor.EXTRACTOR_KEY;
-import static ch.systemsx.cisd.etlserver.IProcessorIDAndDataTypeExtractor.TYPE_EXTRACTOR_KEY;
+import static ch.systemsx.cisd.etlserver.ITypeExtractor.TYPE_EXTRACTOR_KEY;
import static ch.systemsx.cisd.etlserver.IStorageProcessor.STORAGE_PROCESSOR_KEY;
import java.util.Properties;
@@ -46,7 +46,7 @@ import ch.systemsx.cisd.common.utilities.ExtendedProperties;
* </tr>
* <tr>
* <td><code>type-extractor</code></td>
- * <td>{@link IProcessorIDAndDataTypeExtractor}</td>
+ * <td>{@link ITypeExtractor}</td>
* </tr>
* </table> Example of a properties file:
*
@@ -108,10 +108,10 @@ public class PropertiesBasedETLServerPlugin extends ETLServerPlugin
return create(IStorageProcessor.class, properties, STORAGE_PROCESSOR_KEY, true);
}
- private final static IProcessorIDAndDataTypeExtractor createProcedureAndDataTypeExtractor(
+ private final static ITypeExtractor createProcedureAndDataTypeExtractor(
final Properties properties)
{
- return create(IProcessorIDAndDataTypeExtractor.class, properties, TYPE_EXTRACTOR_KEY, true);
+ return create(ITypeExtractor.class, properties, TYPE_EXTRACTOR_KEY, true);
}
private final static IDataSetInfoExtractor createDataSetInfoExtractor(
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/SimpleTypeExtractor.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/SimpleTypeExtractor.java
index a5419279cd2..f11ea18e4ac 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/SimpleTypeExtractor.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/SimpleTypeExtractor.java
@@ -25,12 +25,12 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.LocatorType;
import ch.systemsx.cisd.openbis.generic.shared.dto.types.DataSetTypeCode;
/**
- * Implementation of {@link IProcessorIDAndDataTypeExtractor} which gets the types from the properties
+ * Implementation of {@link ITypeExtractor} which gets the types from the properties
* argument of the constructor.
*
* @author Franz-Josef Elmer
*/
-public class SimpleTypeExtractor implements IProcessorIDAndDataTypeExtractor
+public class SimpleTypeExtractor implements ITypeExtractor
{
public static final String FILE_FORMAT_TYPE_KEY = "file-format-type";
@@ -38,7 +38,7 @@ public class SimpleTypeExtractor implements IProcessorIDAndDataTypeExtractor
public static final String DATA_SET_TYPE_KEY = "data-set-type";
- public static final String PROCESSOR_ID_KEY = "processor-id";
+ public static final String PROCESSOR_TYPE_KEY = "processor-type";
public static final String IS_MEASURED_KEY = "is-measured";
@@ -48,7 +48,7 @@ public class SimpleTypeExtractor implements IProcessorIDAndDataTypeExtractor
private DataSetType dataSetType;
- private String processorID;
+ private String processorType;
private boolean measured;
@@ -62,8 +62,7 @@ public class SimpleTypeExtractor implements IProcessorIDAndDataTypeExtractor
locatorType = new LocatorType(code);
code = properties.getProperty(DATA_SET_TYPE_KEY, DataSetTypeCode.HCS_IMAGE.getCode());
dataSetType = new DataSetType(code);
- processorID =
- properties.getProperty(PROCESSOR_ID_KEY, "DATA_ACQUISITION");
+ processorType = properties.getProperty(PROCESSOR_TYPE_KEY);
measured = "true".equals(properties.getProperty(IS_MEASURED_KEY, "true"));
}
@@ -87,9 +86,9 @@ public class SimpleTypeExtractor implements IProcessorIDAndDataTypeExtractor
return dataSetType;
}
- public String getProcessorID(File incomingDataSetPath)
+ public String getProcessorType(File incomingDataSetPath)
{
- return processorID;
+ return processorType;
}
public boolean isMeasuredData(File incomingDataSetPath)
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 9ef822e10ad..5112dec9217 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/TransferredDataSetHandler.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/TransferredDataSetHandler.java
@@ -110,7 +110,7 @@ public final class TransferredDataSetHandler implements IPathHandler, ISelfTesta
private final Lock registrationLock;
- private final IProcessorIDAndDataTypeExtractor typeExtractor;
+ private final ITypeExtractor typeExtractor;
private final IStorageProcessor storageProcessor;
@@ -307,7 +307,7 @@ public final class TransferredDataSetHandler implements IPathHandler, ISelfTesta
final void registerDataSet()
{
final ExperimentPE experiment = dataSetInformation.getExperiment();
- String processorID = typeExtractor.getProcessorID(incomingDataSetFile);
+ String processorID = typeExtractor.getProcessorType(incomingDataSetFile);
final IProcessor processorOrNull = tryCreateProcessor(processorID);
try
{
@@ -403,8 +403,7 @@ public final class TransferredDataSetHandler implements IPathHandler, ISelfTesta
try
{
errorMessageTemplate = DATA_SET_REGISTRATION_FAILURE_TEMPLATE;
- plainRegisterDataSet(relativePath, procedureTypeCode, availableFormat,
- isCompleteFlag);
+ plainRegisterDataSet(relativePath, availableFormat, isCompleteFlag);
deleteAndLogIsFinishedFile();
deleteAndLogIsFinishedFile();
if (processorOrNull == null)
@@ -507,13 +506,12 @@ public final class TransferredDataSetHandler implements IPathHandler, ISelfTesta
}
private final void plainRegisterDataSet(final String relativePath,
- final String procedureTypeCode, final StorageFormat storageFormat,
- final BooleanOrUnknown isCompleteFlag)
+ final StorageFormat storageFormat, final BooleanOrUnknown isCompleteFlag)
{
final ExternalData data =
createExternalData(relativePath, storageFormat, isCompleteFlag);
// Finally: register the data set in the database.
- limsService.registerDataSet(dataSetInformation, procedureTypeCode, data);
+ limsService.registerDataSet(dataSetInformation, data);
}
private void logAndNotifySuccessfulRegistration(final String email)
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/EncapsulatedOpenBISService.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/EncapsulatedOpenBISService.java
index 095202a9477..d8c48f7c2f1 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/EncapsulatedOpenBISService.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/EncapsulatedOpenBISService.java
@@ -135,7 +135,7 @@ public final class EncapsulatedOpenBISService implements IEncapsulatedOpenBISSer
}
private final void primRegisterDataSet(final DataSetInformation dataSetInformation,
- final String procedureTypeCode, final ExternalData data)
+ final ExternalData data)
{
service.registerDataSet(sessionToken, dataSetInformation.getSampleIdentifier(),
data);
@@ -173,25 +173,24 @@ public final class EncapsulatedOpenBISService implements IEncapsulatedOpenBISSer
}
synchronized public final void registerDataSet(final DataSetInformation dataSetInformation,
- final String procedureTypeCode, final ExternalData data)
+ final ExternalData data)
{
assert dataSetInformation != null : "missing sample identifier";
- assert procedureTypeCode != null : "missing procedure type";
assert data != null : "missing data";
checkSessionToken();
try
{
- primRegisterDataSet(dataSetInformation, procedureTypeCode, data);
+ primRegisterDataSet(dataSetInformation, data);
} catch (final InvalidSessionException ex)
{
authenticate();
- primRegisterDataSet(dataSetInformation, procedureTypeCode, data);
+ primRegisterDataSet(dataSetInformation, data);
}
if (operationLog.isInfoEnabled())
{
operationLog.info("Registered in openBIS: data set " + dataSetInformation.describe()
- + " PROCEDURE_TYPE('" + procedureTypeCode + "').");
+ + ".");
}
}
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IEncapsulatedOpenBISService.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IEncapsulatedOpenBISService.java
index 1b4a499e3d2..e5dd97c795f 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IEncapsulatedOpenBISService.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IEncapsulatedOpenBISService.java
@@ -54,7 +54,7 @@ public interface IEncapsulatedOpenBISService
* </p>
*/
public void registerDataSet(final DataSetInformation dataSetInformation,
- final String procedureTypeCode, final ExternalData data) throws UserFailureException;
+ final ExternalData data) throws UserFailureException;
/**
* Tries to return the properties of the top sample (e.g. master plate) registered for the
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/BDSStorageProcessorTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/BDSStorageProcessorTest.java
index 42034b6c60f..db997742a9c 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/BDSStorageProcessorTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/BDSStorageProcessorTest.java
@@ -125,7 +125,7 @@ public final class BDSStorageProcessorTest extends AbstractFileSystemTestCase
private static final String FILE_EXTRACTOR_KEY = IHCSImageFileExtractor.FILE_EXTRACTOR;
- private final static IProcessorIDAndDataTypeExtractor TYPE_EXTRACTOR =
+ private final static ITypeExtractor TYPE_EXTRACTOR =
new DefaultStorageProcessorTest.TestProcedureAndDataTypeExtractor();
private final static String STORE_ROOT_DIR = "store";
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/DefaultStorageProcessorTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/DefaultStorageProcessorTest.java
index bbe66da3067..2dd6e9fd977 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/DefaultStorageProcessorTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/DefaultStorageProcessorTest.java
@@ -42,7 +42,7 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.types.ProcedureTypeCode;
public final class DefaultStorageProcessorTest extends AbstractFileSystemTestCase
{
- private final static IProcessorIDAndDataTypeExtractor TYPE_EXTRACTOR =
+ private final static ITypeExtractor TYPE_EXTRACTOR =
new TestProcedureAndDataTypeExtractor();
private final DefaultStorageProcessor createStorageProcessor()
@@ -125,7 +125,7 @@ public final class DefaultStorageProcessorTest extends AbstractFileSystemTestCas
// Helper classes
//
- final static class TestProcedureAndDataTypeExtractor implements IProcessorIDAndDataTypeExtractor
+ final static class TestProcedureAndDataTypeExtractor implements ITypeExtractor
{
static final String PROCEDURE_TYPE = ProcedureTypeCode.DATA_ACQUISITION.getCode();
@@ -157,7 +157,7 @@ public final class DefaultStorageProcessorTest extends AbstractFileSystemTestCas
return new DataSetType(DATA_SET_TYPE);
}
- public String getProcessorID(File incomingDataSetPath)
+ public String getProcessorType(File incomingDataSetPath)
{
return "da";
}
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/SimpleTypeExtractorTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/SimpleTypeExtractorTest.java
index 2ca03f4408b..e968e6855a0 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/SimpleTypeExtractorTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/SimpleTypeExtractorTest.java
@@ -40,7 +40,7 @@ public class SimpleTypeExtractorTest
props.put(SimpleTypeExtractor.FILE_FORMAT_TYPE_KEY, "F");
props.put(SimpleTypeExtractor.LOCATOR_TYPE_KEY, "L");
props.put(SimpleTypeExtractor.DATA_SET_TYPE_KEY, "O");
- props.put(SimpleTypeExtractor.PROCESSOR_ID_KEY, "P");
+ props.put(SimpleTypeExtractor.PROCESSOR_TYPE_KEY, "P");
props.put(SimpleTypeExtractor.IS_MEASURED_KEY, "false");
return props;
}
@@ -53,14 +53,14 @@ public class SimpleTypeExtractorTest
assertEquals(LocatorType.DEFAULT_LOCATOR_TYPE_CODE, extractor.getLocatorType(null).getCode());
assertEquals(DataSetTypeCode.HCS_IMAGE
.getCode(), extractor.getDataSetType(null).getCode());
- assertEquals("DATA_ACQUISITION", extractor.getProcessorID(null));
+ assertEquals(null, extractor.getProcessorType(null));
assertEquals(true, extractor.isMeasuredData(null));
extractor = new SimpleTypeExtractor(createProperties());
assertEquals("F", extractor.getFileFormatType(null).getCode());
assertEquals("L", extractor.getLocatorType(null).getCode());
assertEquals("O", extractor.getDataSetType(null).getCode());
- assertEquals("P", extractor.getProcessorID(null));
+ assertEquals("P", extractor.getProcessorType(null));
assertEquals(false, extractor.isMeasuredData(null));
}
}
\ No newline at end of file
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 6e8ef58a6b3..4891b8b2a3a 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/TransferredDataSetHandlerTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/TransferredDataSetHandlerTest.java
@@ -184,7 +184,7 @@ public final class TransferredDataSetHandlerTest extends AbstractFileSystemTestC
private IDataSetInfoExtractor dataSetInfoExtractor;
- private IProcessorIDAndDataTypeExtractor typeExtractor;
+ private ITypeExtractor typeExtractor;
private IStorageProcessor storageProcessor;
@@ -252,7 +252,7 @@ public final class TransferredDataSetHandlerTest extends AbstractFileSystemTestC
context = new Mockery();
dataSetInfoExtractor = context.mock(IDataSetInfoExtractor.class);
- typeExtractor = context.mock(IProcessorIDAndDataTypeExtractor.class);
+ typeExtractor = context.mock(ITypeExtractor.class);
final Properties properties = new Properties();
properties.setProperty(JavaMailProperties.MAIL_SMTP_HOST, "host");
properties.setProperty(JavaMailProperties.MAIL_FROM, "me");
@@ -426,7 +426,7 @@ public final class TransferredDataSetHandlerTest extends AbstractFileSystemTestC
one(typeExtractor).getFileFormatType(dataSet);
will(returnValue(FILE_FORMAT_TYPE));
- one(typeExtractor).getProcessorID(dataSet);
+ one(typeExtractor).getProcessorType(dataSet);
will(returnValue(EXAMPLE_PROCESSOR_ID));
one(typeExtractor).isMeasuredData(dataSet);
@@ -813,7 +813,7 @@ public final class TransferredDataSetHandlerTest extends AbstractFileSystemTestC
one(processorFactory).createProcessor();
will(returnValue(processor));
- one(typeExtractor).getProcessorID(folder);
+ one(typeExtractor).getProcessorType(folder);
will(returnValue(EXAMPLE_PROCESSOR_ID));
one(storageProcessor).storeData(baseExperiment, dataSetInformation,
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/EncapsulatedOpenBISServiceTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/EncapsulatedOpenBISServiceTest.java
index 3dc6d1e8184..08e63deba5d 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/EncapsulatedOpenBISServiceTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/EncapsulatedOpenBISServiceTest.java
@@ -135,7 +135,7 @@ public class EncapsulatedOpenBISServiceTest
data);
}
});
- encapsulatedLimsService.registerDataSet(dataSetInfo, procedureTypeCode.getCode(), data);
+ encapsulatedLimsService.registerDataSet(dataSetInfo, data);
context.assertIsSatisfied();
}
--
GitLab