From c80de7171ff2fd9977fab5c6466a1e4255ac00cf Mon Sep 17 00:00:00 2001
From: brinn <brinn>
Date: Mon, 4 Jun 2012 07:24:03 +0000
Subject: [PATCH] Revert previous change as it breaks the construction of the
top-level dataset handlers by the DSS.
SVN: 25516
---
...tOmniscientTopLevelDataSetRegistrator.java | 11 ++++------
...aultDataSetRegistrationDetailsFactory.java | 21 +++++--------------
.../JythonTopLevelDataSetHandler.java | 10 ++++-----
.../v2/JythonTopLevelDataSetHandlerV2.java | 6 +++---
.../DataSetStorageRollbackerTest.java | 2 +-
.../registrator/TestingDataSetHandler.java | 2 +-
.../registrator/TestingDataSetHandlerV2.java | 2 +-
.../DataSetRegistrationTransactionTest.java | 2 +-
.../etl/jython/JythonPlateDataSetHandler.java | 2 +-
.../v2/JythonPlateDataSetHandlerV2.java | 2 +-
10 files changed, 22 insertions(+), 38 deletions(-)
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/AbstractOmniscientTopLevelDataSetRegistrator.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/AbstractOmniscientTopLevelDataSetRegistrator.java
index 2d44e5063c9..77a8e0d5afa 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/AbstractOmniscientTopLevelDataSetRegistrator.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/AbstractOmniscientTopLevelDataSetRegistrator.java
@@ -243,8 +243,6 @@ public abstract class AbstractOmniscientTopLevelDataSetRegistrator<T extends Dat
protected final OmniscientTopLevelDataSetRegistratorState state;
- private final Class<T> clazz;
-
private boolean stopped;
/**
@@ -253,11 +251,10 @@ public abstract class AbstractOmniscientTopLevelDataSetRegistrator<T extends Dat
* @param globalState
*/
protected AbstractOmniscientTopLevelDataSetRegistrator(
- TopLevelDataSetRegistratorGlobalState globalState, Class<T> clazz)
+ TopLevelDataSetRegistratorGlobalState globalState)
{
super(globalState);
- this.clazz = clazz;
IStorageProcessorTransactional storageProcessor =
PropertiesBasedETLServerPlugin.create(IStorageProcessorTransactional.class,
globalState.getThreadParameters().getThreadProperties(),
@@ -664,10 +661,10 @@ public abstract class AbstractOmniscientTopLevelDataSetRegistrator<T extends Dat
final IDelegatedActionWithResult<Boolean> cleanAfterwardsAction,
ITopLevelDataSetRegistratorDelegate delegate)
{
+ @SuppressWarnings({ "unchecked", "rawtypes" })
DataSetRegistrationService<T> service =
- new DataSetRegistrationService<T>(this, incomingDataSetFile,
- new DefaultDataSetRegistrationDetailsFactory<T>(clazz,
- getRegistratorState(),
+ new DataSetRegistrationService(this, incomingDataSetFile,
+ new DefaultDataSetRegistrationDetailsFactory(getRegistratorState(),
callerDataSetInformationOrNull), cleanAfterwardsAction, delegate);
return service;
}
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/DefaultDataSetRegistrationDetailsFactory.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/DefaultDataSetRegistrationDetailsFactory.java
index 25e738d775f..9b89d10c280 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/DefaultDataSetRegistrationDetailsFactory.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/DefaultDataSetRegistrationDetailsFactory.java
@@ -22,35 +22,24 @@ import ch.systemsx.cisd.openbis.dss.generic.shared.dto.DataSetInformation;
/**
* @author Chandrasekhar Ramakrishnan
*/
-public class DefaultDataSetRegistrationDetailsFactory<T extends DataSetInformation> extends
- AbstractDataSetRegistrationDetailsFactory<T>
+public class DefaultDataSetRegistrationDetailsFactory extends
+ AbstractDataSetRegistrationDetailsFactory<DataSetInformation>
{
- private final Class<T> dataSetInfoClass;
/**
* @param registratorState
*/
public DefaultDataSetRegistrationDetailsFactory(
- Class<T> dataSetInfoClass, OmniscientTopLevelDataSetRegistratorState registratorState,
+ OmniscientTopLevelDataSetRegistratorState registratorState,
DataSetInformation userProvidedDataSetInformationOrNull)
{
super(registratorState, userProvidedDataSetInformationOrNull);
- this.dataSetInfoClass = dataSetInfoClass;
}
@Override
- protected T createDataSetInformation()
+ protected DataSetInformation createDataSetInformation()
{
- try
- {
- return dataSetInfoClass.newInstance();
- } catch (InstantiationException ex)
- {
- throw new Error(ex);
- } catch (IllegalAccessException ex)
- {
- throw new Error(ex);
- }
+ return new DataSetInformation();
}
}
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/JythonTopLevelDataSetHandler.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/JythonTopLevelDataSetHandler.java
index 0b88e7a726a..976dc0918e7 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/JythonTopLevelDataSetHandler.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/JythonTopLevelDataSetHandler.java
@@ -136,10 +136,9 @@ public class JythonTopLevelDataSetHandler<T extends DataSetInformation> extends
*
* @param globalState
*/
- public JythonTopLevelDataSetHandler(TopLevelDataSetRegistratorGlobalState globalState,
- Class<T> clazz)
+ public JythonTopLevelDataSetHandler(TopLevelDataSetRegistratorGlobalState globalState)
{
- super(globalState, clazz);
+ super(globalState);
String path =
PropertyUtils.getMandatoryProperty(globalState.getThreadParameters()
@@ -482,13 +481,12 @@ public class JythonTopLevelDataSetHandler<T extends DataSetInformation> extends
invokeFunction(function, service, transaction);
}
- private void invokeTransactionFunctionWithContext(PyFunction function,
- DataSetRegistrationPersistentMap.IHolder persistentMapHolder,
+ private void invokeTransactionFunctionWithContext(PyFunction function, DataSetRegistrationPersistentMap.IHolder persistentMapHolder,
Object... additionalArgs)
{
if (additionalArgs.length > 0)
{
- invokeFunction(function, persistentMapHolder.getPersistentMap(),
+ invokeFunction(function, persistentMapHolder.getPersistentMap(),
additionalArgs);
} else
{
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/JythonTopLevelDataSetHandlerV2.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/JythonTopLevelDataSetHandlerV2.java
index cf32b3ced21..1dc810d763b 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/JythonTopLevelDataSetHandlerV2.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/JythonTopLevelDataSetHandlerV2.java
@@ -58,15 +58,15 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.TechId;
public class JythonTopLevelDataSetHandlerV2<T extends DataSetInformation> extends
ch.systemsx.cisd.etlserver.registrator.JythonTopLevelDataSetHandler<T>
{
+
/**
* Constructor.
*
* @param globalState
*/
- public JythonTopLevelDataSetHandlerV2(TopLevelDataSetRegistratorGlobalState globalState,
- Class<T> clazz)
+ public JythonTopLevelDataSetHandlerV2(TopLevelDataSetRegistratorGlobalState globalState)
{
- super(globalState, clazz);
+ super(globalState);
}
/**
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/DataSetStorageRollbackerTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/DataSetStorageRollbackerTest.java
index 9200c7a3bdc..2741f2d4c3f 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/DataSetStorageRollbackerTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/DataSetStorageRollbackerTest.java
@@ -142,7 +142,7 @@ public class DataSetStorageRollbackerTest extends AbstractFileSystemTestCase
*/
protected TestDataSetRegistrator(TopLevelDataSetRegistratorGlobalState globalState)
{
- super(globalState, DataSetInformation.class);
+ super(globalState);
}
@Override
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/TestingDataSetHandler.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/TestingDataSetHandler.java
index e15b1188b5c..2fad00a1b3a 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/TestingDataSetHandler.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/TestingDataSetHandler.java
@@ -14,7 +14,7 @@ public class TestingDataSetHandler extends JythonTopLevelDataSetHandler<DataSetI
public TestingDataSetHandler(TopLevelDataSetRegistratorGlobalState globalState,
boolean shouldRegistrationFail, boolean shouldReThrowRollbackException)
{
- super(globalState, DataSetInformation.class);
+ super(globalState);
this.expectations =
new TestingDataSetHandlerExpectations(shouldRegistrationFail,
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/TestingDataSetHandlerV2.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/TestingDataSetHandlerV2.java
index 28728fb0e89..3499ef2ace8 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/TestingDataSetHandlerV2.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/TestingDataSetHandlerV2.java
@@ -15,7 +15,7 @@ public class TestingDataSetHandlerV2 extends JythonTopLevelDataSetHandlerV2<Data
public TestingDataSetHandlerV2(TopLevelDataSetRegistratorGlobalState globalState,
boolean shouldRegistrationFail, boolean shouldReThrowRollbackException)
{
- super(globalState, DataSetInformation.class);
+ super(globalState);
this.expectations =
new TestingDataSetHandlerExpectations(shouldRegistrationFail,
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/DataSetRegistrationTransactionTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/DataSetRegistrationTransactionTest.java
index 5b53f2a124a..2bcaa84f74d 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/DataSetRegistrationTransactionTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/DataSetRegistrationTransactionTest.java
@@ -680,7 +680,7 @@ public class DataSetRegistrationTransactionTest extends AbstractFileSystemTestCa
*/
protected TestingDataSetHandler(TopLevelDataSetRegistratorGlobalState globalState)
{
- super(globalState, DataSetInformation.class);
+ super(globalState);
}
@Override
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/jython/JythonPlateDataSetHandler.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/jython/JythonPlateDataSetHandler.java
index 670b0afd3bc..0437c456ca2 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/jython/JythonPlateDataSetHandler.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/jython/JythonPlateDataSetHandler.java
@@ -28,7 +28,7 @@ public class JythonPlateDataSetHandler extends JythonTopLevelDataSetHandler<Data
public JythonPlateDataSetHandler(TopLevelDataSetRegistratorGlobalState globalState)
{
- super(globalState, DataSetInformation.class);
+ super(globalState);
originalDirName =
JythonPlateDataSetHandlerUtils.parseOriginalDir(globalState.getThreadParameters()
.getThreadProperties());
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/jython/v2/JythonPlateDataSetHandlerV2.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/jython/v2/JythonPlateDataSetHandlerV2.java
index 59096b18f09..21336ee67c0 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/jython/v2/JythonPlateDataSetHandlerV2.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/jython/v2/JythonPlateDataSetHandlerV2.java
@@ -52,7 +52,7 @@ public class JythonPlateDataSetHandlerV2 extends JythonTopLevelDataSetHandlerV2<
*/
public JythonPlateDataSetHandlerV2(TopLevelDataSetRegistratorGlobalState globalState)
{
- super(globalState, DataSetInformation.class);
+ super(globalState);
originalDirName = JythonPlateDataSetHandlerUtils.parseOriginalDir(globalState.getThreadParameters().getThreadProperties());
}
--
GitLab