Merge "Add getDigest() method in VFS and InputVFS interfaces" into ub-jack

9 files changed, 42 insertions, 0 deletions

diff --git a/sched/src/com/android/sched/vfs/AbstractInputOutputVFS.java b/sched/src/com/android/sched/vfs/AbstractInputOutputVFS.java
index 2b95223..94770d2 100644
--- a/sched/src/com/android/sched/vfs/AbstractInputOutputVFS.java
+++ b/sched/src/com/android/sched/vfs/AbstractInputOutputVFS.java
@@ -53,4 +53,10 @@ public abstract class AbstractInputOutputVFS extends AbstractVFS implements Inpu
 
     return root;
   }
+
+  @Override
+  @CheckForNull
+  public String getDigest() {
+    return null;
+  }
 }
diff --git a/sched/src/com/android/sched/vfs/AbstractInputVFS.java b/sched/src/com/android/sched/vfs/AbstractInputVFS.java
index 3ea4aad..c484a5e 100644
--- a/sched/src/com/android/sched/vfs/AbstractInputVFS.java
+++ b/sched/src/com/android/sched/vfs/AbstractInputVFS.java
@@ -37,4 +37,10 @@ public abstract class AbstractInputVFS extends AbstractVFS implements InputVFS {
 
     return root;
   }
+
+  @Override
+  @CheckForNull
+  public String getDigest() {
+    return null;
+  }
 }
diff --git a/sched/src/com/android/sched/vfs/BaseVFS.java b/sched/src/com/android/sched/vfs/BaseVFS.java
index e5ba32b..eb42576 100644
--- a/sched/src/com/android/sched/vfs/BaseVFS.java
+++ b/sched/src/com/android/sched/vfs/BaseVFS.java
@@ -28,6 +28,7 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.Collection;
 
+import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
 
 /**
@@ -107,4 +108,10 @@ abstract class BaseVFS<DIR extends BaseVDir, FILE extends BaseVFile> implements
   synchronized boolean isClosed() {
     return closed;
   }
+
+  @Override
+  @CheckForNull
+  public String getDigest() {
+    return null;
+  }
 }
diff --git a/sched/src/com/android/sched/vfs/GenericInputOutputVFS.java b/sched/src/com/android/sched/vfs/GenericInputOutputVFS.java
index d0b3772..a945a17 100644
--- a/sched/src/com/android/sched/vfs/GenericInputOutputVFS.java
+++ b/sched/src/com/android/sched/vfs/GenericInputOutputVFS.java
@@ -20,6 +20,7 @@ import com.android.sched.util.location.Location;
 
 import java.io.IOException;
 
+import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
 
 /**
@@ -72,4 +73,10 @@ public class GenericInputOutputVFS extends AbstractVFS implements InputOutputVFS
   public boolean needsSequentialWriting() {
     return vfs.needsSequentialWriting();
   }
+
+  @Override
+  @CheckForNull
+  public String getDigest() {
+    return vfs.getDigest();
+  }
 }
diff --git a/sched/src/com/android/sched/vfs/GenericInputVFS.java b/sched/src/com/android/sched/vfs/GenericInputVFS.java
index b0eadb3..e1e29c6 100644
--- a/sched/src/com/android/sched/vfs/GenericInputVFS.java
+++ b/sched/src/com/android/sched/vfs/GenericInputVFS.java
@@ -20,6 +20,7 @@ import com.android.sched.util.location.Location;
 
 import java.io.IOException;
 
+import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
 
 /**
@@ -55,4 +56,10 @@ public class GenericInputVFS extends AbstractVFS implements InputVFS {
   public void close() throws IOException {
     vfs.close();
   }
+
+  @Override
+  @CheckForNull
+  public String getDigest() {
+    return vfs.getDigest();
+  }
 }
diff --git a/sched/src/com/android/sched/vfs/InputVFS.java b/sched/src/com/android/sched/vfs/InputVFS.java
index 41383fc..b606e76 100644
--- a/sched/src/com/android/sched/vfs/InputVFS.java
+++ b/sched/src/com/android/sched/vfs/InputVFS.java
@@ -20,6 +20,7 @@ import com.android.sched.util.location.HasLocation;
 
 import java.io.Closeable;
 
+import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
 
 /**
@@ -30,4 +31,6 @@ public interface InputVFS extends HasLocation, Closeable {
   String getPath();
   @Nonnull
   InputVDir getRootInputVDir();
+  @CheckForNull
+  String getDigest();
 }
diff --git a/sched/src/com/android/sched/vfs/MessageDigestFS.java b/sched/src/com/android/sched/vfs/MessageDigestFS.java
index ecfa437..294eb6d 100644
--- a/sched/src/com/android/sched/vfs/MessageDigestFS.java
+++ b/sched/src/com/android/sched/vfs/MessageDigestFS.java
@@ -250,6 +250,7 @@ public class MessageDigestFS extends BaseVFS<BaseVDir, MessageDigestVFile> imple
     return vfs.getPath();
   }
 
+  @Override
   @Nonnull
   public synchronized String getDigest() {
     if (digest == null) {
diff --git a/sched/src/com/android/sched/vfs/MessageDigestInputVFS.java b/sched/src/com/android/sched/vfs/MessageDigestInputVFS.java
index 85df125..d4a866f 100644
--- a/sched/src/com/android/sched/vfs/MessageDigestInputVFS.java
+++ b/sched/src/com/android/sched/vfs/MessageDigestInputVFS.java
@@ -251,6 +251,7 @@ public class MessageDigestInputVFS extends MessageDigestVFS implements InputVFS
     return algorithm;
   }
 
+  @Override
   @CheckForNull
   public String getDigest() {
     return digest;
diff --git a/sched/src/com/android/sched/vfs/VFS.java b/sched/src/com/android/sched/vfs/VFS.java
index fe6cf18..fdb3f7c 100644
--- a/sched/src/com/android/sched/vfs/VFS.java
+++ b/sched/src/com/android/sched/vfs/VFS.java
@@ -22,6 +22,7 @@ import com.android.sched.util.location.HasLocation;
 import java.io.Closeable;
 import java.util.Set;
 
+import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
 
 /**
@@ -38,4 +39,7 @@ public interface VFS extends HasLocation, Closeable, HasDescription {
 
   @Nonnull
   Set<Capabilities> getCapabilities();
+
+  @CheckForNull
+  String getDigest();
 }