From ef38c071627cfa9872c214cb07973ab53bb03f3c Mon Sep 17 00:00:00 2001 From: Colby Ranger Date: Tue, 7 May 2013 16:18:41 -0700 Subject: [PATCH] Rename Patches to Files and PatchResource to FileResource. Change-Id: I682f68631a0b00f8180d792373ada05ccb833824 --- .../change/{PatchResource.java => FileResource.java} | 8 ++++---- .../server/change/{Patches.java => Files.java} | 12 ++++++------ .../java/com/google/gerrit/server/change/Module.java | 12 ++++++------ .../com/google/gerrit/server/change/Reviewed.java | 10 +++++----- 4 files changed, 21 insertions(+), 21 deletions(-) rename gerrit-server/src/main/java/com/google/gerrit/server/change/{PatchResource.java => FileResource.java} (83%) rename gerrit-server/src/main/java/com/google/gerrit/server/change/{Patches.java => Files.java} (79%) diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/PatchResource.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/FileResource.java similarity index 83% rename from gerrit-server/src/main/java/com/google/gerrit/server/change/PatchResource.java rename to gerrit-server/src/main/java/com/google/gerrit/server/change/FileResource.java index d3cf5c61fb..d777164c3e 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/PatchResource.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/FileResource.java @@ -20,14 +20,14 @@ import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.reviewdb.client.Patch; import com.google.inject.TypeLiteral; -public class PatchResource implements RestResource { - public static final TypeLiteral> PATCH_KIND = - new TypeLiteral>() {}; +public class FileResource implements RestResource { + public static final TypeLiteral> FILE_KIND = + new TypeLiteral>() {}; private final RevisionResource rev; private final Patch.Key key; - PatchResource(RevisionResource rev, String name) { + FileResource(RevisionResource rev, String name) { this.rev = rev; this.key = new Patch.Key(rev.getPatchSet().getId(), name); } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/Patches.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/Files.java similarity index 79% rename from gerrit-server/src/main/java/com/google/gerrit/server/change/Patches.java rename to gerrit-server/src/main/java/com/google/gerrit/server/change/Files.java index cb0a9bf012..c2fd51b65d 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/Patches.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/Files.java @@ -23,16 +23,16 @@ import com.google.gerrit.extensions.restapi.RestView; import com.google.gwtorm.server.OrmException; import com.google.inject.Inject; -class Patches implements ChildCollection { - private final DynamicMap> views; +class Files implements ChildCollection { + private final DynamicMap> views; @Inject - Patches(DynamicMap> views) { + Files(DynamicMap> views) { this.views = views; } @Override - public DynamicMap> views() { + public DynamicMap> views() { return views; } @@ -42,8 +42,8 @@ class Patches implements ChildCollection { } @Override - public PatchResource parse(RevisionResource rev, IdString id) + public FileResource parse(RevisionResource rev, IdString id) throws ResourceNotFoundException, OrmException, AuthException { - return new PatchResource(rev, id.get()); + return new FileResource(rev, id.get()); } } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/Module.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/Module.java index 690faf3147..c0fa3f61f8 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/Module.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/Module.java @@ -17,7 +17,7 @@ package com.google.gerrit.server.change; import static com.google.gerrit.server.change.ChangeResource.CHANGE_KIND; import static com.google.gerrit.server.change.CommentResource.COMMENT_KIND; import static com.google.gerrit.server.change.DraftResource.DRAFT_KIND; -import static com.google.gerrit.server.change.PatchResource.PATCH_KIND; +import static com.google.gerrit.server.change.FileResource.FILE_KIND; import static com.google.gerrit.server.change.ReviewerResource.REVIEWER_KIND; import static com.google.gerrit.server.change.RevisionResource.REVISION_KIND; @@ -35,12 +35,12 @@ public class Module extends RestApiModule { bind(Reviewers.class); bind(Drafts.class); bind(Comments.class); - bind(Patches.class); + bind(Files.class); DynamicMap.mapOf(binder(), CHANGE_KIND); DynamicMap.mapOf(binder(), COMMENT_KIND); DynamicMap.mapOf(binder(), DRAFT_KIND); - DynamicMap.mapOf(binder(), PATCH_KIND); + DynamicMap.mapOf(binder(), FILE_KIND); DynamicMap.mapOf(binder(), REVIEWER_KIND); DynamicMap.mapOf(binder(), REVISION_KIND); @@ -76,9 +76,9 @@ public class Module extends RestApiModule { child(REVISION_KIND, "comments").to(Comments.class); get(COMMENT_KIND).to(GetComment.class); - child(REVISION_KIND, "files").to(Patches.class); - put(PATCH_KIND, "reviewed").to(PutReviewed.class); - delete(PATCH_KIND, "reviewed").to(DeleteReviewed.class); + child(REVISION_KIND, "files").to(Files.class); + put(FILE_KIND, "reviewed").to(PutReviewed.class); + delete(FILE_KIND, "reviewed").to(DeleteReviewed.class); install(new FactoryModule() { @Override diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/Reviewed.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/Reviewed.java index 0898bce15d..42d81b69d1 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/Reviewed.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/Reviewed.java @@ -28,7 +28,7 @@ class Reviewed { static class Input { } - static class PutReviewed implements RestModifyView { + static class PutReviewed implements RestModifyView { private final Provider dbProvider; @Inject @@ -37,7 +37,7 @@ class Reviewed { } @Override - public Object apply(PatchResource resource, Input input) + public Object apply(FileResource resource, Input input) throws OrmException { ReviewDb db = dbProvider.get(); AccountPatchReview apr = getExisting(db, resource); @@ -52,7 +52,7 @@ class Reviewed { } } - static class DeleteReviewed implements RestModifyView { + static class DeleteReviewed implements RestModifyView { private final Provider dbProvider; @Inject @@ -61,7 +61,7 @@ class Reviewed { } @Override - public Object apply(PatchResource resource, Input input) + public Object apply(FileResource resource, Input input) throws OrmException { ReviewDb db = dbProvider.get(); AccountPatchReview apr = getExisting(db, resource); @@ -73,7 +73,7 @@ class Reviewed { } private static AccountPatchReview getExisting(ReviewDb db, - PatchResource resource) throws OrmException { + FileResource resource) throws OrmException { AccountPatchReview.Key key = new AccountPatchReview.Key( resource.getPatchKey(), resource.getAccountId()); return db.accountPatchReviews().get(key);