SSDM-1081: Missing @Override annotation in MultiDataSetFileOperationsManager...

SSDM-1081: Missing @Override annotation in MultiDataSetFileOperationsManager added. Exception messages in MultiDatasetArchiver.verifyDataSetsSize() improved.

SVN: 32680

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

@@ -128,6 +128,7 @@ public class MultiDataSetFileOperationsManager extends AbstractDataSetFileOperat
         return finalArchive;
     }
 
+    @Override
     public Status deleteContainerFromStage(String containerPath)
     {
         File stageArchiveContainerFile = new File(getStageArchive().getDestination(), containerPath);
@@ -141,6 +142,7 @@ public class MultiDataSetFileOperationsManager extends AbstractDataSetFileOperat
         return success ? Status.OK : Status.createError("Couldn't delete archive container '" + containerPath);
     }
 
+    @Override
     public Status createContainerInStage(String containerPath, List<DatasetDescription> datasetDescriptions)
     {
         File stageArchiveContainerFile = new File(getStageArchive().getDestination(), containerPath);
@@ -201,6 +203,7 @@ public class MultiDataSetFileOperationsManager extends AbstractDataSetFileOperat
     /**
      * Returns container path local to the archive root.
      */
+    @Override
     public String generateContainerPath(List<DatasetDescription> dataSets)
     {
         String name = packageManager.getName(dataSets.get(0).getDataSetCode());
@@ -220,6 +223,7 @@ public class MultiDataSetFileOperationsManager extends AbstractDataSetFileOperat
      * Copies specified dataset's data to destination specified in constructor. The path at the destination is defined by the original location of the
      * data set.
      */
+    @Override
     public Status copyToFinalDestination(String containerLocalPath)
     {
         ArchiveDestination stageDestination = getStageArchive();
@@ -249,6 +253,7 @@ public class MultiDataSetFileOperationsManager extends AbstractDataSetFileOperat
         }
     }
 
+    @Override
     public Status deleteContainerFromFinalDestination(String containerLocalPath)
     {
         try
@@ -272,6 +277,7 @@ public class MultiDataSetFileOperationsManager extends AbstractDataSetFileOperat
             }
         };
 
+    @Override
     public IHierarchicalContent getContainerAsHierarchicalContent(String containerPath)
     {
         ArchiveDestination archiveDestination = getFinalArchive();

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

@@ -24,6 +24,7 @@ import java.util.Properties;
 import ch.systemsx.cisd.common.exceptions.NotImplementedException;
 import ch.systemsx.cisd.common.exceptions.Status;
 import ch.systemsx.cisd.common.filesystem.BooleanStatus;
+import ch.systemsx.cisd.common.filesystem.FileUtilities;
 import ch.systemsx.cisd.common.properties.PropertyUtils;
 import ch.systemsx.cisd.openbis.common.io.hierarchical_content.api.IHierarchicalContent;
 import ch.systemsx.cisd.openbis.common.io.hierarchical_content.api.IHierarchicalContentNode;
@@ -124,7 +125,9 @@ public class MultiDatasetArchiver extends AbstractArchiverProcessingPlugin
             if (datasetSize < minimumContainerSize)
             {
                 throw new IllegalArgumentException("Dataset " + dataSets.get(0).getDataSetCode()
-                        + " is too small to be archived with multi dataset archiver.");
+                        + " is too small (" + FileUtilities.byteCountToDisplaySize(datasetSize) 
+                        + ") to be archived with multi dataset archiver because minimum size is " 
+                        + FileUtilities.byteCountToDisplaySize(minimumContainerSize) + ".");
             }
             // if single dataset is bigger than specified maximum, we should still allow it being
         }
@@ -132,11 +135,17 @@ public class MultiDatasetArchiver extends AbstractArchiverProcessingPlugin
         {
             if (datasetSize < minimumContainerSize)
             {
-                throw new IllegalArgumentException("Datasets specified for archiving are too small to be archived with multi dataset archiver.");
+                throw new IllegalArgumentException("Set of data sets specified for archiving is too small ("
+                        + FileUtilities.byteCountToDisplaySize(datasetSize) 
+                        + ") to be archived with multi dataset archiver because minimum size is " 
+                        + FileUtilities.byteCountToDisplaySize(minimumContainerSize) + ".");
             }
             else if (datasetSize > maximumContainerSize)
             {
-                throw new IllegalArgumentException("Datasets specified for archiving are too big to be archived with multi dataset archiver.");
+                throw new IllegalArgumentException("Set of data sets specified for archiving is too big ("
+                        + FileUtilities.byteCountToDisplaySize(datasetSize) 
+                        + ") to be archived with multi dataset archiver because maximum size is " 
+                        + FileUtilities.byteCountToDisplaySize(maximumContainerSize) + ".");
             }
         }
     }