commit 6e797486b7f89299b826a7d726f86edbae345ac8
author Dave Borowitz <dborowitz@google.com> Thu May 01 11:10:01 2014 -0700
committer Dave Borowitz <dborowitz@google.com> Tue May 06 14:31:33 2014 -0700
tree 3c2a732579ed6fbfbecf0eee11058059a05b2a0a
parent 7c0a833b8afd63e80355b5800cc0040bf12104f3

Pass ObjectReaders directly into BlobSoyData/TreeSoyData

Note that Commmit*Data still needs the actual RevWalk to do a tree
diff.

Change-Id: I1a6976ea6508597c4734a864d9ff7994d4a8edd4

gitiles-servlet/src/main/java/com/google/gitiles/BlobSoyData.java

diff --git a/gitiles-servlet/src/main/java/com/google/gitiles/BlobSoyData.java b/gitiles-servlet/src/main/java/com/google/gitiles/BlobSoyData.java
index 857fa91..927c5c2 100644
--- a/gitiles-servlet/src/main/java/com/google/gitiles/BlobSoyData.java
+++ b/gitiles-servlet/src/main/java/com/google/gitiles/BlobSoyData.java
@@ -30,7 +30,6 @@
 import org.eclipse.jgit.lib.ObjectId;
 import org.eclipse.jgit.lib.ObjectLoader;
 import org.eclipse.jgit.lib.ObjectReader;
-import org.eclipse.jgit.revwalk.RevWalk;
 import org.eclipse.jgit.util.RawParseUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -58,11 +57,6 @@
   private final GitilesView view;
   private final ObjectReader reader;
 
-  // TODO(dborowitz): Remove this constructor.
-  public BlobSoyData(RevWalk walk, GitilesView view) {
-    this(walk.getObjectReader(), view);
-  }
-
   public BlobSoyData(ObjectReader reader, GitilesView view) {
     this.reader = reader;
     this.view = view;

gitiles-servlet/src/main/java/com/google/gitiles/RevisionServlet.java

diff --git a/gitiles-servlet/src/main/java/com/google/gitiles/RevisionServlet.java b/gitiles-servlet/src/main/java/com/google/gitiles/RevisionServlet.java
index 987ade8..d065a45 100644
--- a/gitiles-servlet/src/main/java/com/google/gitiles/RevisionServlet.java
+++ b/gitiles-servlet/src/main/java/com/google/gitiles/RevisionServlet.java
@@ -95,12 +95,12 @@
             case OBJ_TREE:
               soyObjects.add(ImmutableMap.of(
                   "type", Constants.TYPE_TREE,
-                  "data", new TreeSoyData(walk, view).toSoyData(obj)));
+                  "data", new TreeSoyData(walk.getObjectReader(), view).toSoyData(obj)));
               break;
             case OBJ_BLOB:
               soyObjects.add(ImmutableMap.of(
                   "type", Constants.TYPE_BLOB,
-                  "data", new BlobSoyData(walk, view).toSoyData(obj)));
+                  "data", new BlobSoyData(walk.getObjectReader(), view).toSoyData(obj)));
               hasBlob = true;
               break;
             case OBJ_TAG:

gitiles-servlet/src/main/java/com/google/gitiles/TreeSoyData.java

diff --git a/gitiles-servlet/src/main/java/com/google/gitiles/TreeSoyData.java b/gitiles-servlet/src/main/java/com/google/gitiles/TreeSoyData.java
index 428de98..2c55a70 100644
--- a/gitiles-servlet/src/main/java/com/google/gitiles/TreeSoyData.java
+++ b/gitiles-servlet/src/main/java/com/google/gitiles/TreeSoyData.java
@@ -26,7 +26,6 @@
 import org.eclipse.jgit.errors.MissingObjectException;
 import org.eclipse.jgit.lib.ObjectId;
 import org.eclipse.jgit.lib.ObjectReader;
-import org.eclipse.jgit.revwalk.RevWalk;
 import org.eclipse.jgit.treewalk.TreeWalk;
 
 import java.io.IOException;
@@ -74,11 +73,6 @@
   private final GitilesView view;
   private ArchiveFormat archiveFormat;
 
-  // TODO(dborowitz): Remove this constructor.
-  public TreeSoyData(RevWalk rw, GitilesView view) {
-    this(rw.getObjectReader(), view);
-  }
-
   public TreeSoyData(ObjectReader reader, GitilesView view) {
     this.reader = reader;
     this.view = view;

gitiles-servlet/src/main/java/com/google/gitiles/blame/BlameServlet.java

diff --git a/gitiles-servlet/src/main/java/com/google/gitiles/blame/BlameServlet.java b/gitiles-servlet/src/main/java/com/google/gitiles/blame/BlameServlet.java
index 2b37f47..cba7dee 100644
--- a/gitiles-servlet/src/main/java/com/google/gitiles/blame/BlameServlet.java
+++ b/gitiles-servlet/src/main/java/com/google/gitiles/blame/BlameServlet.java
@@ -77,7 +77,8 @@
       }
 
       String title = "Blame - " + view.getPathPart();
-      Map<String, ?> blobData = new BlobSoyData(rw, view).toSoyData(view.getPathPart(), blobId);
+      Map<String, ?> blobData = new BlobSoyData(rw.getObjectReader(), view)
+          .toSoyData(view.getPathPart(), blobId);
       if (blobData.get("lines") != null) {
         List<Region> regions = cache.get(repo, commit, view.getPathPart());
         if (regions.isEmpty()) {