opendev/gerrit
Code Issues Proposed changes

Don't parse non-existing files in files REST collections

Browse Source 
For non-existing members REST collections are expected to throw
ResourceNotFoundException.

Change-Id: I97680b9fc17d0348aef1a5926f73c7e948737e07
Signed-off-by: Edwin Kempin <ekempin@google.com>
This commit is contained in:
Edwin Kempin
2016-08-22 13:17:43 +02:00
parent 0520e08cb6
commit 6213c5a984
3 changed files with 44 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
gerrit-server/src/main/java/com/google/gerrit/server/project/FilesInCommitCollection.java
View File

@@ -19,17 +19,23 @@ import com.google.gerrit.extensions.restapi.ChildCollection;
import com.google.gerrit.extensions.restapi.IdString;
import com.google.gerrit.extensions.restapi.ResourceNotFoundException;
import com.google.gerrit.extensions.restapi.RestView;
import com.google.gerrit.server.git.GitRepositoryManager;
import com.google.inject.Inject;
import com.google.inject.Singleton;
import java.io.IOException;
@Singleton
public class FilesInCommitCollection implements
ChildCollection<CommitResource, FileResource> {
private final DynamicMap<RestView<FileResource>> views;
private final GitRepositoryManager repoManager;
@Inject
FilesInCommitCollection(DynamicMap<RestView<FileResource>> views) {
FilesInCommitCollection(DynamicMap<RestView<FileResource>> views,
GitRepositoryManager repoManager) {
this.views = views;
this.repoManager = repoManager;
}
@Override
@@ -39,8 +45,9 @@ public class FilesInCommitCollection implements
@Override
public FileResource parse(CommitResource parent, IdString id)
throws ResourceNotFoundException {
return new FileResource(parent.getProject(), parent.getCommit(), id.get());
throws ResourceNotFoundException, IOException {
return FileResource.create(repoManager, parent.getProject(),
parent.getCommit(), id.get());
}
@Override