SSDM-6072: fixing MultiDataSetArchivingFinalizer and MultiDataSetArchivingFinalizerTest

datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetArchivingFinalizer.java

@@ -247,7 +247,10 @@ class MultiDataSetArchivingFinalizer implements IProcessingPluginTask
         Map<String, String> parameterBindings = context.getParameterBindings();
         operationLog.info("Parameters: " + parameterBindings);
         Parameters parameters = new Parameters();
-        parameters.setContainerId(getNumber(parameterBindings, CONTAINER_ID_KEY));
+        if (parameterBindings.containsKey(CONTAINER_ID_KEY))
+        {
+            parameters.setContainerId(getNumber(parameterBindings, CONTAINER_ID_KEY));
+        }
         parameters.setOriginalFile(new File(getProperty(parameterBindings, ORIGINAL_FILE_PATH_KEY)));
         parameters.setReplicatedFile(new File(getProperty(parameterBindings, REPLICATED_FILE_PATH_KEY)));
         parameters.setPollingTime(getNumber(parameterBindings, FINALIZER_POLLING_TIME_KEY));

datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetArchivingFinalizerTest.java

@@ -186,7 +186,7 @@ public class MultiDataSetArchivingFinalizerTest extends AbstractFileSystemTestCa
                 + "Parameters: {original-file-path=" + dataFileInArchive.getPath()
                 + ", replicated-file-path=" + dataFileReplicated.getPath() + ", "
                 + "finalizer-polling-time=20000, start-time=" + START_TIME_AS_STRING + ", "
-                + "finalizer-max-waiting-time=300000, status=ARCHIVED, GROUP_KEY=my-group}\n"
+                + "finalizer-max-waiting-time=300000, status=ARCHIVED, sub-directory=my-group}\n"
                 + "ERROR OPERATION.MultiDataSetArchivingFinalizer - Replication of "
                 + "'" + dataFileInArchive.getPath() + "' failed because the original file does not exist.",
                 logRecorder.getLogContent());
@@ -211,7 +211,7 @@ public class MultiDataSetArchivingFinalizerTest extends AbstractFileSystemTestCa
                 + "Parameters: {original-file-path=" + dataFileInArchive.getPath()
                 + ", replicated-file-path=" + dataFileReplicated.getPath() + ", "
                 + "finalizer-polling-time=20000, start-time=" + START_TIME_AS_STRING + ", "
-                + "finalizer-max-waiting-time=300000, status=ARCHIVED, GROUP_KEY=my-group}\n"
+                + "finalizer-max-waiting-time=300000, status=ARCHIVED, sub-directory=my-group}\n"
                 + "INFO  OPERATION.MultiDataSetArchivingFinalizer - Waiting for replication of archive "
                 + "'" + dataFileInArchive.getPath() + "' containing the following data sets: [ds1]\n"
                 + "INFO  OPERATION.MultiDataSetArchivingFinalizer - Condition fulfilled after < 1sec, condition: "
@@ -236,7 +236,7 @@ public class MultiDataSetArchivingFinalizerTest extends AbstractFileSystemTestCa
                 + "Parameters: {original-file-path=" + dataFileInArchive.getPath()
                 + ", replicated-file-path=" + dataFileReplicated.getPath() + ", "
                 + "finalizer-polling-time=20000, start-time=" + START_TIME_AS_STRING + ", "
-                + "finalizer-max-waiting-time=300000, status=AVAILABLE, GROUP_KEY=my-group}\n"
+                + "finalizer-max-waiting-time=300000, status=AVAILABLE, sub-directory=my-group}\n"
                 + "INFO  OPERATION.MultiDataSetArchivingFinalizer - Waiting for replication of archive "
                 + "'" + dataFileInArchive.getPath() + "' containing the following data sets: [ds1]\n"
                 + "INFO  OPERATION.MultiDataSetArchivingFinalizer - Condition fulfilled after < 1sec, condition: "
@@ -291,7 +291,7 @@ public class MultiDataSetArchivingFinalizerTest extends AbstractFileSystemTestCa
                 + "Parameters: {original-file-path=" + dataFileInArchive.getPath()
                 + ", replicated-file-path=" + dataFilePartiallyReplicated.getPath() + ", "
                 + "finalizer-polling-time=20000, start-time=" + START_TIME_AS_STRING + ", "
-                + "finalizer-max-waiting-time=300000, status=ARCHIVED, GROUP_KEY=my-group}\n"
+                + "finalizer-max-waiting-time=300000, status=ARCHIVED, sub-directory=my-group}\n"
                 + "INFO  OPERATION.MultiDataSetArchivingFinalizer - Waiting for replication of archive "
                 + "'" + dataFileInArchive.getPath() + "' containing the following data sets: [ds1, ds2]\n"
                 + "INFO  OPERATION.MultiDataSetArchivingFinalizer - Condition still not fulfilled after < 1sec, "
@@ -344,7 +344,7 @@ public class MultiDataSetArchivingFinalizerTest extends AbstractFileSystemTestCa
                 + "Parameters: {original-file-path=" + dataFileInArchive.getPath()
                 + ", replicated-file-path=" + dataFilePartiallyReplicated.getPath() + ", "
                 + "finalizer-polling-time=20000, start-time=" + START_TIME_AS_STRING + ", "
-                + "finalizer-max-waiting-time=300000, status=AVAILABLE, GROUP_KEY=my-group}\n"
+                + "finalizer-max-waiting-time=300000, status=AVAILABLE, sub-directory=my-group}\n"
                 + "INFO  OPERATION.MultiDataSetArchivingFinalizer - Waiting for replication of archive "
                 + "'" + dataFileInArchive.getPath() + "' containing the following data sets: [ds1, ds2]\n"
                 + "INFO  OPERATION.MultiDataSetArchivingFinalizer - Condition still not fulfilled after < 1sec, "