diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/DataSetRegistrationAlgorithm.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/DataSetRegistrationAlgorithm.java index 8fc133788cb02467f4f6fe1c5ed7f324d39849ad..a1a4d4e405813103d329e71299a9c17241600be1 100644 --- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/DataSetRegistrationAlgorithm.java +++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/DataSetRegistrationAlgorithm.java @@ -567,7 +567,6 @@ public class DataSetRegistrationAlgorithm // Finally: register the data set in the database. registerDataSetInApplicationServer(data); state.openBisService.setStorageConfirmed(data.getCode()); - state.openBisService.markDataSetForRegistration(data.getCode()); } private final NewExternalData updateExternalData(NewExternalData data, diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/DataSetStorageAlgorithmRunner.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/DataSetStorageAlgorithmRunner.java index 9afc647aa7f2a1b0382fa445210c8f45fe304ec9..e927172cb42ab660f52b537f1d90452bf4055c43 100644 --- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/DataSetStorageAlgorithmRunner.java +++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/DataSetStorageAlgorithmRunner.java @@ -243,8 +243,6 @@ public class DataSetStorageAlgorithmRunner<T extends DataSetInformation> String dataSetCode = storageAlgorithm.getDataSetInformation() .getDataSetCode(); openBISService.setStorageConfirmed(dataSetCode); - System.err.println("making the datasetCode for registration : "+dataSetCode); - openBISService.markDataSetForRegistration(dataSetCode); } dssRegistrationLog.log("Storage has been confirmed in openBIS Application Server."); 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 ddd92f2ad188ecc83ea39576db4966fe689c1f5e..952f72fb6d2b3bc6298191b0f782261b4cd267c6 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 @@ -627,8 +627,4 @@ public final class EncapsulatedOpenBISService implements IEncapsulatedOpenBISSer return service.listDataSetsForPostRegistration(session.getToken(), session.getDataStoreCode()); } - public void markDataSetForRegistration(String dataSetCode) - { - service.markDataSetForRegistration(session.getToken(), dataSetCode); - } } \ No newline at end of file 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 0f06f3b74eea84fdee09f7c239c374a14aa93866..df6b8c20a6b035cf73d66da459137adaeafad6ad 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 @@ -497,12 +497,6 @@ public interface IEncapsulatedOpenBISService @ManagedAuthentication public void setStorageConfirmed(String dataSetCode); - /** - * {@link IETLLIMSService#markDataSetForRegistration(String, String)} - */ - @ManagedAuthentication - public void markDataSetForRegistration(String dataSetCode); - /** * {@link IETLLIMSService#markSuccessfulPostRegistration(String, String)} */ diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/DataSetRegistrationAlgorithmTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/DataSetRegistrationAlgorithmTest.java index 900c99e8da1bb9b6a5176e5355265a311a0077a1..c6feed46e0bd032a6944fb627996beb2aad8dd0f 100644 --- a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/DataSetRegistrationAlgorithmTest.java +++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/DataSetRegistrationAlgorithmTest.java @@ -295,7 +295,6 @@ public class DataSetRegistrationAlgorithmTest extends AbstractFileSystemTestCase { { one(openBisService).setStorageConfirmed(DATA_SET_CODE); - one(openBisService).markDataSetForRegistration(DATA_SET_CODE); } }); } diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JythonTopLevelDataSetRegistratorTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JythonTopLevelDataSetRegistratorTest.java index d743e018040d4f71ab140f21f4bfc670725cc668..0bbccf1d5148e204cdfce59ed8278e846b02971f 100644 --- a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JythonTopLevelDataSetRegistratorTest.java +++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JythonTopLevelDataSetRegistratorTest.java @@ -132,8 +132,6 @@ public class JythonTopLevelDataSetRegistratorTest extends AbstractJythonDataSetH will(doAll(returnValue(new AtomicEntityOperationResult()), checkPrecommitDirIsNotEmpty())); one(openBisService).setStorageConfirmed(DATA_SET_CODE); - one(openBisService).markDataSetForRegistration(DATA_SET_CODE); - will(checkPrecommitDirIsEmpty()); } @@ -390,9 +388,6 @@ public class JythonTopLevelDataSetRegistratorTest extends AbstractJythonDataSetH one(openBisService).setStorageConfirmed(DATA_SET_CODE + 1); one(openBisService).setStorageConfirmed(DATA_SET_CODE + 2); - - one(openBisService).markDataSetForRegistration(DATA_SET_CODE + 1); - one(openBisService).markDataSetForRegistration(DATA_SET_CODE + 2); } }); @@ -470,7 +465,6 @@ public class JythonTopLevelDataSetRegistratorTest extends AbstractJythonDataSetH will(returnValue(new AtomicEntityOperationResult())); one(openBisService).setStorageConfirmed(DATA_SET_CODE); - one(openBisService).markDataSetForRegistration(DATA_SET_CODE); } }); @@ -531,7 +525,6 @@ public class JythonTopLevelDataSetRegistratorTest extends AbstractJythonDataSetH will(returnValue(new AtomicEntityOperationResult())); one(openBisService).setStorageConfirmed(DATA_SET_CODE); - one(openBisService).markDataSetForRegistration(DATA_SET_CODE); } }); @@ -605,7 +598,6 @@ public class JythonTopLevelDataSetRegistratorTest extends AbstractJythonDataSetH will(returnValue(new AtomicEntityOperationResult())); one(openBisService).setStorageConfirmed(DATA_SET_CODE); - one(openBisService).markDataSetForRegistration(DATA_SET_CODE); } }); @@ -673,7 +665,6 @@ public class JythonTopLevelDataSetRegistratorTest extends AbstractJythonDataSetH will(returnValue(new AtomicEntityOperationResult())); one(openBisService).setStorageConfirmed(DATA_SET_CODE); - one(openBisService).markDataSetForRegistration(DATA_SET_CODE); } }); 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 acc9ee4198c743f9e72378f799b0e3b1b99c459a..e3de0c663fedf548fe155261e1a3565b5459e2dc 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 @@ -512,7 +512,6 @@ public class DataSetRegistrationTransactionTest extends AbstractFileSystemTestCa will(returnValue(new AtomicEntityOperationResult())); one(openBisService).setStorageConfirmed(with(any(String.class))); - one(openBisService).markDataSetForRegistration(with(any(String.class))); } } });