diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ETLService.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ETLService.java index e5e82eb54c4fdf4f1d0ddd0d15da68813eee458a..120d5a954858fc5dccfcdc57015aeb0b682ac22e 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ETLService.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ETLService.java @@ -1593,20 +1593,7 @@ public class ETLService extends AbstractCommonServer<IETLLIMSService> implements dataBO.loadByCode(dataSetCode); dataBO.setStorageConfirmed(); - } - - public void markDataSetForRegistration(String sessionToken, String dataSetCode) - { - assert sessionToken != null : "Unspecified session token."; - - final Session session = getSession(sessionToken); - - final IDataBO dataBO = businessObjectFactory.createDataBO(session); - dataBO.loadByCode(dataSetCode); - DataPE data = dataBO.getData(); - - daoFactory.getPostRegistrationDAO().addDataSet(data); - + daoFactory.getPostRegistrationDAO().addDataSet(dataBO.getData()); } public void markSuccessfulPostRegistration(String sessionToken, String dataSetCode) diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ETLServiceLogger.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ETLServiceLogger.java index fff64efe892450a2abe14bd304126808caec63d8..43123b641465ea85765e5db0ab6981c6a32b9664 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ETLServiceLogger.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ETLServiceLogger.java @@ -554,11 +554,6 @@ public class ETLServiceLogger extends AbstractServerLogger implements IETLLIMSSe logAccess(sessionToken, "setStorageConfirmed", "DATA_SET_CODE(%s)", dataSetCode); } - public void markDataSetForRegistration(String sessionToken, String dataSetCode) - { - logAccess(sessionToken, "setStorageConfirmed", "DATA_SET_CODE(%s)", dataSetCode); - } - public void markSuccessfulPostRegistration(String sessionToken, String dataSetCode) { logAccess(sessionToken, "markSuccessfulPostRegistration", "DATA_SET_CODE(%s)", dataSetCode); diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/IETLLIMSService.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/IETLLIMSService.java index 1db88abf3248ae7a1b48f549b6d96f5c36f12782..0266a1b05b0a93f91c18defc90d8c7e387dd3871 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/IETLLIMSService.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/IETLLIMSService.java @@ -776,22 +776,15 @@ public interface IETLLIMSService extends IServer, ISessionProvider public List<String> getTrustedCrossOriginDomains(String sessionToken); /** - * Marks the storage of dataset as confirmed. + * Marks the storage of dataset as confirmed. Adds the given dataset to post-registration queue */ @Transactional @RolesAllowed(RoleWithHierarchy.SPACE_ETL_SERVER) @DatabaseUpdateModification(value = { ObjectKind.DATA_SET }) - public void setStorageConfirmed(String sessionToken, String dataSetCode); - - /** - * Adds the given dataset to post-registration queue. - */ - @Transactional - @RolesAllowed(RoleWithHierarchy.SPACE_ETL_SERVER) @DatabaseCreateOrDeleteModification(value = { ObjectKind.POSTREGISTRATION_QUEUE }) - public void markDataSetForRegistration(String token, String dataSetCode); + public void setStorageConfirmed(String sessionToken, String dataSetCode); /** * Informs that the post-registration task for a given dataset was performed, and it should be diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/IETLLIMSService.java.expected b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/IETLLIMSService.java.expected index 1db88abf3248ae7a1b48f549b6d96f5c36f12782..0266a1b05b0a93f91c18defc90d8c7e387dd3871 100644 --- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/IETLLIMSService.java.expected +++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/IETLLIMSService.java.expected @@ -776,22 +776,15 @@ public interface IETLLIMSService extends IServer, ISessionProvider public List<String> getTrustedCrossOriginDomains(String sessionToken); /** - * Marks the storage of dataset as confirmed. + * Marks the storage of dataset as confirmed. Adds the given dataset to post-registration queue */ @Transactional @RolesAllowed(RoleWithHierarchy.SPACE_ETL_SERVER) @DatabaseUpdateModification(value = { ObjectKind.DATA_SET }) - public void setStorageConfirmed(String sessionToken, String dataSetCode); - - /** - * Adds the given dataset to post-registration queue. - */ - @Transactional - @RolesAllowed(RoleWithHierarchy.SPACE_ETL_SERVER) @DatabaseCreateOrDeleteModification(value = { ObjectKind.POSTREGISTRATION_QUEUE }) - public void markDataSetForRegistration(String token, String dataSetCode); + public void setStorageConfirmed(String sessionToken, String dataSetCode); /** * Informs that the post-registration task for a given dataset was performed, and it should be