prepare for v0.10.4 release

Author: Jorrit Poelen

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>org.globalbioticinteractions</groupId>
     <artifactId>preston-all</artifactId>
-    <version>0.10.4-SNAPSHOT</version>
+    <version>0.10.4</version>
     <packaging>pom</packaging>
     <name>Preston Modules</name>
     <modules>

preston-cas/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>bio.guoda</groupId>
         <artifactId>preston-parent</artifactId>
-        <version>0.10.4-SNAPSHOT</version>
+        <version>0.10.4</version>
         <relativePath>../preston-parent/pom.xml</relativePath>
     </parent>
 

preston-cli/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>bio.guoda</groupId>
         <artifactId>preston-parent</artifactId>
-        <version>0.10.4-SNAPSHOT</version>
+        <version>0.10.4</version>
         <relativePath>../preston-parent/pom.xml</relativePath>
     </parent>
 

preston-cli/src/main/java/bio/guoda/preston/cmd/CmdVerify.java

@@ -16,6 +16,7 @@
 import picocli.CommandLine;
 
 import java.io.File;
+import java.util.AbstractCollection;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -45,6 +46,13 @@ public class CmdVerify extends Persisting implements Runnable {
 
     public static final String DO_NOT_VERIFY_HASH_JUST_CHECK_AVAILABILITY = "Do not verify hash, just check availability";
 
+    public static final List<VerificationState> CONTENT_PRESENT_STATES = Arrays.asList(
+            VerificationState.CONTENT_PRESENT_HASH_NOT_VERIFIED,
+            VerificationState.CONTENT_PRESENT_HASH_OPERATION_SUCCEEDS,
+            VerificationState.CONTENT_PRESENT_INVALID_HASH,
+            VerificationState.CONTENT_PRESENT_VALID_HASH
+    );
+
     @CommandLine.Option(
             names = "--skip-hash-verification",
             description = DO_NOT_VERIFY_HASH_JUST_CHECK_AVAILABILITY

preston-cli/src/main/java/bio/guoda/preston/cmd/HashVerifier.java

@@ -170,12 +170,37 @@ private static VerificationEntry verifyAuthenticity(IRI expectedHash, InputStrea
     private void writeEntry(VerificationEntry verificationEntry) {
         verifiedMap.put(verificationEntry.getIri().getIRIString(), verificationEntry.getState());
 
-        String uriString = HashKeyUtil.isValidPlainHashKey(verificationEntry.getIri())
+        String uriString = hasContentLocation(verificationEntry)
                 ? keyToPath.toPath(verificationEntry.getIri()).toString()
                 : verificationEntry.getIri().getIRIString();
-        String msg = writeVerificationLogEntry(verificationEntry.getIri(), verificationEntry.getState(), verificationEntry.getCalculatedHashIRI(), verificationEntry.getFileSize(), uriString);
+
         new PrintStream(outputStream)
-                .print(msg);
+                .print(getMsg(verificationEntry, uriString));
+    }
+
+    private boolean hasContentLocation(VerificationEntry verificationEntry) {
+        return CmdVerify.CONTENT_PRESENT_STATES.contains(verificationEntry.getState())
+                && HashKeyUtil.isValidPlainHashKey(verificationEntry.getIri());
+    }
+
+    private String getMsg(VerificationEntry verificationEntry, String uriString) {
+        VerificationState state = verificationEntry.getState();
+        IRI calculatedHashIRI = verificationEntry.getCalculatedHashIRI();
+        Long fileSize = verificationEntry.getFileSize();
+        String stateString = "FAIL";
+        if (CmdVerify.OK_STATES.contains(state)) {
+            stateString = "OK";
+        } else if (CmdVerify.SKIP_STATES.contains(state)) {
+            stateString = "SKIP";
+        }
+
+        return verificationEntry.getIri().getIRIString() + "\t" +
+                uriString + "\t" +
+                stateString + "\t" +
+                state + "\t" +
+                (fileSize == null ? "" : fileSize) + "\t" +
+                (calculatedHashIRI == null ? "" : calculatedHashIRI.getIRIString()) +
+                "\n";
     }
 
     private String writeVerificationLogEntry(IRI iri,

preston-cmd/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>bio.guoda</groupId>
         <artifactId>preston-parent</artifactId>
-        <version>0.10.4-SNAPSHOT</version>
+        <version>0.10.4</version>
         <relativePath>../preston-parent/pom.xml</relativePath>
     </parent>
 

preston-core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>bio.guoda</groupId>
         <artifactId>preston-parent</artifactId>
-        <version>0.10.4-SNAPSHOT</version>
+        <version>0.10.4</version>
         <relativePath>../preston-parent/pom.xml</relativePath>
     </parent>
 

preston-dbase/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>bio.guoda</groupId>
         <artifactId>preston-parent</artifactId>
-        <version>0.10.4-SNAPSHOT</version>
+        <version>0.10.4</version>
         <relativePath>../preston-parent/pom.xml</relativePath>
     </parent>
 

preston-dwc/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>bio.guoda</groupId>
         <artifactId>preston-parent</artifactId>
-        <version>0.10.4-SNAPSHOT</version>
+        <version>0.10.4</version>
         <relativePath>../preston-parent/pom.xml</relativePath>
     </parent>
 

preston-excel/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>bio.guoda</groupId>
         <artifactId>preston-parent</artifactId>
-        <version>0.10.4-SNAPSHOT</version>
+        <version>0.10.4</version>
         <relativePath>../preston-parent/pom.xml</relativePath>
     </parent>