diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetArchivingFinalizer.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetArchivingFinalizer.java index af4e02f586daf49ba35105d3c9e15e0be8f4b7c7..a1f2471ffea97413cc054bff686a09b715dc1dba 100644 --- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetArchivingFinalizer.java +++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetArchivingFinalizer.java @@ -65,7 +65,7 @@ class MultiDataSetArchivingFinalizer implements IProcessingPluginTask public static final String START_TIME_KEY = "start-time"; public static final String STATUS_KEY = "status"; - public static final String TIME_STAMP_FORMAT = "yyyy-MM-dd HH:mm:ss"; + public static final String TIME_STAMP_FORMAT = "yyyyMMdd-HHmmss"; private static final Logger operationLog = LogFactory.getLogger(LogCategory.OPERATION, MultiDataSetArchivingFinalizer.class); diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetArchiverTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetArchiverTest.java index 1277cb4da4dd0575bc398cc881f962d203ff93c3..bb5d7448aab787a6a7fbbf069fb5de57817db943 100644 --- a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetArchiverTest.java +++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetArchiverTest.java @@ -738,7 +738,8 @@ public class MultiDataSetArchiverTest extends AbstractFileSystemTestCase assertEquals(1, freeSpaceRecorder.getRecordedObjects().size()); assertEquals("{original-file-path=" + archive.getAbsolutePath() + "/ds2-yyyyMMdd-HHmmss.tar, " + "replicated-file-path=" + replicate.getAbsolutePath() + "/ds2-yyyyMMdd-HHmmss.tar, " - + "finalizer-polling-time=300000, finalizer-max-waiting-time=172800000, status=ARCHIVED}", + + "finalizer-polling-time=300000, start-time=yyyyMMdd-HHmmss, " + + "finalizer-max-waiting-time=172800000, status=ARCHIVED}", removeTimeInformationFromContent(parametersRecorder.recordedObject().toString())); assertEquals("", dataSetDeleter.toString()); assertEquals("[" + staging.getAbsolutePath() + "/ds2-yyyyMMdd-HHmmss.tar]", @@ -1463,7 +1464,7 @@ public class MultiDataSetArchiverTest extends AbstractFileSystemTestCase private String removeTimeInformationFromContent(String content) { return content.replaceAll("0:\\d{2}:\\d{2}\\.\\d{3}", "0:??:??.???") - .replaceAll("\\d{8}-\\d{6}\\.tar", "yyyyMMdd-HHmmss.tar"); + .replaceAll("\\d{8}-\\d{6}", "yyyyMMdd-HHmmss"); } }