BIS-506 / SP-841: Display warning message if pathinfo db is not configured

SVN: 29694

datastore_server/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/batch/BatchResult.java

@@ -36,7 +36,8 @@ public class BatchResult
     {
         this.results = new TreeMap<String, DataSetArchiveVerificationResult>();
 
-        DataSetArchiveVerificationResult missingResult = new DataSetArchiveVerificationResult(VerificationErrorType.ERROR, "dataset not processed");
+        DataSetArchiveVerificationResult missingResult =
+                new DataSetArchiveVerificationResult(VerificationErrorType.ERROR, "Internal error, dataset archive not verified");
 
         for (String dataSet : dataSets)
         {

datastore_server/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/batch/DataSetArchiveVerificationResult.java

@@ -47,7 +47,7 @@ public class DataSetArchiveVerificationResult
     public DataSetArchiveVerificationResult(Exception e)
     {
         this.file = null;
-        this.errors = Collections.singletonList(new VerificationError(VerificationErrorType.ERROR, e.getClass().getName()+":"+e.getMessage()));
+        this.errors = Collections.singletonList(new VerificationError(VerificationErrorType.ERROR, e.getClass().getName() + ":" + e.getMessage()));
     }
 
     public ResultType getType()
@@ -68,6 +68,8 @@ public class DataSetArchiveVerificationResult
         {
             case WARNING:
                 return ResultType.WARNING;
+            case GENERAL_WARNING:
+                return ResultType.GENERAL_WARNING;
             case ERROR:
                 return ResultType.ERROR;
             case FATAL:

datastore_server/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/batch/ResultType.java

@@ -23,7 +23,7 @@ package ch.systemsx.cisd.openbis.dss.archiveverifier.batch;
  */
 public enum ResultType
 {
-    OK(0), WARNING(1), ERROR(2), FATAL(2);
+    OK(0), WARNING(1), GENERAL_WARNING(1), ERROR(2), FATAL(2);
 
     private final int exitCode;
 

datastore_server/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/batch/SerialDataSetArchiveVerificationBatch.java

@@ -16,6 +16,9 @@
 
 package ch.systemsx.cisd.openbis.dss.archiveverifier.batch;
 
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.UUID;
 
 /**
  * Runs archive verification for a list of datasets.
@@ -29,16 +32,28 @@ public class SerialDataSetArchiveVerificationBatch implements IDataSetArchiveVer
 
     private final String[] dataSets;
 
+    private BatchResult batchResult;
+
     public SerialDataSetArchiveVerificationBatch(IDataSetArchiveVerifier verifier, String... dataSets)
+    {
+        this(verifier, new HashSet<DataSetArchiveVerificationResult>(), dataSets);
+    }
+
+    public SerialDataSetArchiveVerificationBatch(IDataSetArchiveVerifier verifier, Collection<DataSetArchiveVerificationResult> initialResults,
+            String... dataSets)
     {
         this.verifier = verifier;
         this.dataSets = dataSets;
+        batchResult = new BatchResult(dataSets);
+        for (DataSetArchiveVerificationResult initialResult : initialResults)
+        {
+            batchResult.add(UUID.randomUUID().toString(), initialResult);
+        }
     }
 
     @Override
     public BatchResult run()
     {
-        BatchResult batchResult = new BatchResult(dataSets);
 
         for (String dataSet : dataSets)
         {

datastore_server/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/batch/VerificationErrorType.java

@@ -24,5 +24,5 @@ package ch.systemsx.cisd.openbis.dss.archiveverifier.batch;
 public enum VerificationErrorType
 {
     // don't change the order as the code depends on it
-    WARNING, ERROR, FATAL;
+    WARNING, GENERAL_WARNING, ERROR, FATAL;
 }

datastore_server/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/cli/DataSetArchiveVerificationBatchFactory.java

@@ -26,6 +26,7 @@ import java.sql.DriverManager;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.List;
 import java.util.Properties;
 
@@ -83,7 +84,15 @@ public class DataSetArchiveVerificationBatchFactory
             List<IArchiveFileVerifier> verifiers = getVerifiers(properties, pathInfoRepository);
             DataSetArchiveVerifier verifier = new DataSetArchiveVerifier(archiveFileRepository, new CompositeVerifier(verifiers));
 
-            return new SerialDataSetArchiveVerificationBatch(verifier, Arrays.copyOfRange(args, 1, args.length));
+            if (pathInfoRepository == null)
+            {
+                Collection<DataSetArchiveVerificationResult> init = new ArrayList<DataSetArchiveVerificationResult>();
+                init.add(new DataSetArchiveVerificationResult(VerificationErrorType.GENERAL_WARNING, "pathinfo db not configured"));
+                return new SerialDataSetArchiveVerificationBatch(verifier, init, Arrays.copyOfRange(args, 1, args.length));
+            } else
+            {
+                return new SerialDataSetArchiveVerificationBatch(verifier, Arrays.copyOfRange(args, 1, args.length));
+            }
 
         } catch (ConfigurationException e)
         {

datastore_server/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/cli/ResultPrinter.java

@@ -74,6 +74,9 @@ public class ResultPrinter
             if (VerificationErrorType.FATAL.equals(type))
             {
                 out.println(result.getErrors().get(0).getMessage());
+            } else if (VerificationErrorType.GENERAL_WARNING.equals(type))
+            {
+                out.println("WARNING: " + error.getMessage());
             } else
             {
                 out.println(type + " in " + dataSet + " (" + result.getFileName() + "): " + error.getMessage());
@@ -98,6 +101,7 @@ public class ResultPrinter
         int warning = counts.get(ResultType.WARNING);
         int error = counts.get(ResultType.ERROR);
         int fatal = counts.get(ResultType.FATAL);
+        int generalWarnings = counts.get(ResultType.GENERAL_WARNING);
 
         int total = ok + warning + error;
 
@@ -112,7 +116,7 @@ public class ResultPrinter
 
         if (warning + error == 0)
         {
-            out.println("No errors found");
+            out.println("No errors found.");
         } else
         {
             if (error > 0)
@@ -124,5 +128,10 @@ public class ResultPrinter
                 out.println(warning + " archive file(s) caused warnings");
             }
         }
+
+        if (generalWarnings > 0)
+        {
+            out.println(generalWarnings + " general warning(s).");
+        }
     }
 }