opendev/gerrit
Code Issues Proposed changes

Move base64 response encoding into BinaryResult

Browse Source 
Make it easy for any RestApiView to return binary data within a
base64 wrapper by marking a BinaryResult with base64() before it
is given to RestApiServlet. The servlet will process the base64
wrapping before gzip encoding, which may save on transfer cost.

Change-Id: I5ed7b8cb2b034b60654cc2574e627159b11a4f27
This commit is contained in:
Shawn Pearce
2013-05-09 11:54:17 -07:00
parent a523bd8c00
commit 45b0ed1633
3 changed files with 60 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
gerrit-server/src/main/java/com/google/gerrit/server/change/GetContent.java
View File

@@ -14,11 +14,9 @@
package com.google.gerrit.server.change;
import com.google.common.base.Charsets;
import com.google.common.io.BaseEncoding;
import com.google.gerrit.extensions.restapi.BinaryResult;
import com.google.gerrit.extensions.restapi.ResourceNotFoundException;
import com.google.gerrit.extensions.restapi.RestReadView;
import com.google.gerrit.extensions.restapi.StreamingResponse;
import com.google.gerrit.reviewdb.client.Project;
import com.google.gerrit.server.git.GitRepositoryManager;
import com.google.inject.Inject;
@@ -32,7 +30,6 @@ import org.eclipse.jgit.treewalk.TreeWalk;
import java.io.IOException;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
public class GetContent implements RestReadView<FileResource> {
private final GitRepositoryManager repoManager;
@@ -43,7 +40,7 @@ public class GetContent implements RestReadView<FileResource> {
}
@Override
public StreamingResponse apply(FileResource rsrc)
public BinaryResult apply(FileResource rsrc)
throws ResourceNotFoundException, IOException {
Project.NameKey project =
rsrc.getRevision().getControl().getProject().getNameKey();
@@ -61,21 +58,13 @@ public class GetContent implements RestReadView<FileResource> {
throw new ResourceNotFoundException();
}
try {
final ObjectLoader loader = repo.open(tw.getObjectId(0));
return new StreamingResponse() {
final ObjectLoader object = repo.open(tw.getObjectId(0));
return new BinaryResult() {
@Override
public String getContentType() {
return "text/plain;charset=UTF-8";
public void writeTo(OutputStream os) throws IOException {
object.copyTo(os);
}
@Override
public void stream(OutputStream out) throws IOException {
OutputStream b64Out = BaseEncoding.base64().encodingStream(
new OutputStreamWriter(out, Charsets.UTF_8));
loader.copyTo(b64Out);
b64Out.close();
}
};
}.setContentLength(object.getSize()).base64();
} finally {
tw.release();
}