From b21a8eb062f9ad47992af79dd962e36a45be09b6 Mon Sep 17 00:00:00 2001 From: Edwin Kempin Date: Fri, 20 Jul 2018 09:14:51 +0200 Subject: [PATCH] Rename RetryingRestCollectionView to RetryingRestCollectionModifyView Change Id2289a51c7 renamed RestCollectionView to RestCollectionModifyView. For name consistency RetryingRestCollectionView should be renamed to RetryingRestCollectionModifyView as it implements RestCollectionModifyView now. This name is also consistent with the existing RetryingRestModifyView which implements RestModifyView. Change-Id: I0c4c80705ea78ff748907f493b350c99f15584cb Signed-off-by: Edwin Kempin --- .../com/google/gerrit/server/restapi/change/CreateChange.java | 4 ++-- .../google/gerrit/server/restapi/change/PostReviewers.java | 4 ++-- .../gerrit/server/restapi/change/PublishChangeEdit.java | 4 ++-- .../google/gerrit/server/restapi/change/RebaseChangeEdit.java | 4 ++-- ...lectionView.java => RetryingRestCollectionModifyView.java} | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) rename java/com/google/gerrit/server/update/{RetryingRestCollectionView.java => RetryingRestCollectionModifyView.java} (92%) diff --git a/java/com/google/gerrit/server/restapi/change/CreateChange.java b/java/com/google/gerrit/server/restapi/change/CreateChange.java index a04716d42e..b48e0404b6 100644 --- a/java/com/google/gerrit/server/restapi/change/CreateChange.java +++ b/java/com/google/gerrit/server/restapi/change/CreateChange.java @@ -69,7 +69,7 @@ import com.google.gerrit.server.restapi.project.CommitsCollection; import com.google.gerrit.server.restapi.project.ProjectsCollection; import com.google.gerrit.server.update.BatchUpdate; import com.google.gerrit.server.update.RetryHelper; -import com.google.gerrit.server.update.RetryingRestCollectionView; +import com.google.gerrit.server.update.RetryingRestCollectionModifyView; import com.google.gerrit.server.update.UpdateException; import com.google.gwtorm.server.OrmException; import com.google.inject.Inject; @@ -98,7 +98,7 @@ import org.eclipse.jgit.util.ChangeIdUtil; @Singleton public class CreateChange - extends RetryingRestCollectionView< + extends RetryingRestCollectionModifyView< TopLevelResource, ChangeResource, ChangeInput, Response> { private final String anonymousCowardName; private final Provider db; diff --git a/java/com/google/gerrit/server/restapi/change/PostReviewers.java b/java/com/google/gerrit/server/restapi/change/PostReviewers.java index 0df86d1403..0244775575 100644 --- a/java/com/google/gerrit/server/restapi/change/PostReviewers.java +++ b/java/com/google/gerrit/server/restapi/change/PostReviewers.java @@ -71,7 +71,7 @@ import com.google.gerrit.server.restapi.account.AccountsCollection; import com.google.gerrit.server.restapi.group.GroupsCollection; import com.google.gerrit.server.update.BatchUpdate; import com.google.gerrit.server.update.RetryHelper; -import com.google.gerrit.server.update.RetryingRestCollectionView; +import com.google.gerrit.server.update.RetryingRestCollectionModifyView; import com.google.gerrit.server.update.UpdateException; import com.google.gwtorm.server.OrmException; import com.google.inject.Inject; @@ -87,7 +87,7 @@ import org.eclipse.jgit.lib.Config; @Singleton public class PostReviewers - extends RetryingRestCollectionView< + extends RetryingRestCollectionModifyView< ChangeResource, ReviewerResource, AddReviewerInput, AddReviewerResult> { public static final int DEFAULT_MAX_REVIEWERS_WITHOUT_CHECK = 10; diff --git a/java/com/google/gerrit/server/restapi/change/PublishChangeEdit.java b/java/com/google/gerrit/server/restapi/change/PublishChangeEdit.java index 7f4844ed9a..3633e99e0d 100644 --- a/java/com/google/gerrit/server/restapi/change/PublishChangeEdit.java +++ b/java/com/google/gerrit/server/restapi/change/PublishChangeEdit.java @@ -32,7 +32,7 @@ import com.google.gerrit.server.project.ContributorAgreementsChecker; import com.google.gerrit.server.project.NoSuchProjectException; import com.google.gerrit.server.update.BatchUpdate; import com.google.gerrit.server.update.RetryHelper; -import com.google.gerrit.server.update.RetryingRestCollectionView; +import com.google.gerrit.server.update.RetryingRestCollectionModifyView; import com.google.gerrit.server.update.UpdateException; import com.google.gwtorm.server.OrmException; import com.google.inject.Inject; @@ -70,7 +70,7 @@ public class PublishChangeEdit @Singleton public static class Publish - extends RetryingRestCollectionView< + extends RetryingRestCollectionModifyView< ChangeResource, ChangeEditResource.Publish, PublishChangeEditInput, Response> { private final ChangeEditUtil editUtil; diff --git a/java/com/google/gerrit/server/restapi/change/RebaseChangeEdit.java b/java/com/google/gerrit/server/restapi/change/RebaseChangeEdit.java index 8868e0e9ca..e054672844 100644 --- a/java/com/google/gerrit/server/restapi/change/RebaseChangeEdit.java +++ b/java/com/google/gerrit/server/restapi/change/RebaseChangeEdit.java @@ -32,7 +32,7 @@ import com.google.gerrit.server.permissions.PermissionBackendException; import com.google.gerrit.server.project.InvalidChangeOperationException; import com.google.gerrit.server.update.BatchUpdate; import com.google.gerrit.server.update.RetryHelper; -import com.google.gerrit.server.update.RetryingRestCollectionView; +import com.google.gerrit.server.update.RetryingRestCollectionModifyView; import com.google.gwtorm.server.OrmException; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -68,7 +68,7 @@ public class RebaseChangeEdit @Singleton public static class Rebase - extends RetryingRestCollectionView< + extends RetryingRestCollectionModifyView< ChangeResource, ChangeEditResource.Rebase, Input, Response> { private final GitRepositoryManager repositoryManager; private final ChangeEditModifier editModifier; diff --git a/java/com/google/gerrit/server/update/RetryingRestCollectionView.java b/java/com/google/gerrit/server/update/RetryingRestCollectionModifyView.java similarity index 92% rename from java/com/google/gerrit/server/update/RetryingRestCollectionView.java rename to java/com/google/gerrit/server/update/RetryingRestCollectionModifyView.java index 78aa54abaf..76203867dd 100644 --- a/java/com/google/gerrit/server/update/RetryingRestCollectionView.java +++ b/java/com/google/gerrit/server/update/RetryingRestCollectionModifyView.java @@ -20,12 +20,12 @@ import com.google.gerrit.extensions.restapi.ResourceConflictException; import com.google.gerrit.extensions.restapi.RestCollectionModifyView; import com.google.gerrit.extensions.restapi.RestResource; -public abstract class RetryingRestCollectionView< +public abstract class RetryingRestCollectionModifyView< P extends RestResource, C extends RestResource, I, O> implements RestCollectionModifyView { private final RetryHelper retryHelper; - protected RetryingRestCollectionView(RetryHelper retryHelper) { + protected RetryingRestCollectionModifyView(RetryHelper retryHelper) { this.retryHelper = retryHelper; }