DeleteRef: move required input to method parameters
DeleteRef could be an operation class. It's better to
provide the input through method parameters rather than
storing them inside an instance of the class.
Change-Id: I909a779b828f63283cdf23be2e4e69ddca02b6d6
diff --git a/java/com/google/gerrit/server/restapi/project/DeleteBranch.java b/java/com/google/gerrit/server/restapi/project/DeleteBranch.java
index aed372c..5678295 100644
--- a/java/com/google/gerrit/server/restapi/project/DeleteBranch.java
+++ b/java/com/google/gerrit/server/restapi/project/DeleteBranch.java
@@ -17,6 +17,7 @@
import static com.google.gerrit.reviewdb.client.RefNames.isConfigRef;
import static org.eclipse.jgit.lib.Constants.R_HEADS;
+import com.google.common.collect.ImmutableSet;
import com.google.gerrit.extensions.common.Input;
import com.google.gerrit.extensions.restapi.MethodNotAllowedException;
import com.google.gerrit.extensions.restapi.ResourceConflictException;
@@ -67,7 +68,7 @@
throw new ResourceConflictException("branch " + rsrc.getBranchKey() + " has open changes");
}
- deleteRefFactory.create(rsrc).ref(rsrc.getRef()).prefix(R_HEADS).delete();
+ deleteRefFactory.create(rsrc).delete(ImmutableSet.of(rsrc.getRef()), R_HEADS);
return Response.none();
}
}
diff --git a/java/com/google/gerrit/server/restapi/project/DeleteBranches.java b/java/com/google/gerrit/server/restapi/project/DeleteBranches.java
index d8166e1..821b12f 100644
--- a/java/com/google/gerrit/server/restapi/project/DeleteBranches.java
+++ b/java/com/google/gerrit/server/restapi/project/DeleteBranches.java
@@ -16,6 +16,7 @@
import static org.eclipse.jgit.lib.Constants.R_HEADS;
+import com.google.common.collect.ImmutableSet;
import com.google.gerrit.extensions.api.projects.DeleteBranchesInput;
import com.google.gerrit.extensions.restapi.BadRequestException;
import com.google.gerrit.extensions.restapi.Response;
@@ -43,7 +44,7 @@
if (input == null || input.branches == null || input.branches.isEmpty()) {
throw new BadRequestException("branches must be specified");
}
- deleteRefFactory.create(project).refs(input.branches).prefix(R_HEADS).delete();
+ deleteRefFactory.create(project).delete(ImmutableSet.copyOf(input.branches), R_HEADS);
return Response.none();
}
}
diff --git a/java/com/google/gerrit/server/restapi/project/DeleteRef.java b/java/com/google/gerrit/server/restapi/project/DeleteRef.java
index 769eaf8..e675b6b 100644
--- a/java/com/google/gerrit/server/restapi/project/DeleteRef.java
+++ b/java/com/google/gerrit/server/restapi/project/DeleteRef.java
@@ -14,14 +14,17 @@
package com.google.gerrit.server.restapi.project;
+import static com.google.common.collect.ImmutableSet.toImmutableSet;
import static com.google.gerrit.reviewdb.client.RefNames.isConfigRef;
import static java.lang.String.format;
-import static java.util.stream.Collectors.toList;
import static org.eclipse.jgit.lib.Constants.R_REFS;
import static org.eclipse.jgit.lib.Constants.R_TAGS;
import static org.eclipse.jgit.transport.ReceiveCommand.Type.DELETE;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Iterables;
import com.google.common.flogger.FluentLogger;
+import com.google.gerrit.common.Nullable;
import com.google.gerrit.extensions.restapi.AuthException;
import com.google.gerrit.extensions.restapi.ResourceConflictException;
import com.google.gerrit.reviewdb.client.Branch;
@@ -39,8 +42,6 @@
import com.google.inject.Provider;
import com.google.inject.assistedinject.Assisted;
import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
import org.eclipse.jgit.errors.LockFailedException;
import org.eclipse.jgit.lib.BatchRefUpdate;
import org.eclipse.jgit.lib.NullProgressMonitor;
@@ -65,8 +66,6 @@
private final RefValidationHelper refDeletionValidator;
private final Provider<InternalChangeQuery> queryProvider;
private final ProjectResource resource;
- private final List<String> refsToDelete;
- private String prefix;
public interface Factory {
DeleteRef create(ProjectResource r);
@@ -88,39 +87,28 @@
this.refDeletionValidator = refDeletionValidatorFactory.create(DELETE);
this.queryProvider = queryProvider;
this.resource = resource;
- this.refsToDelete = new ArrayList<>();
}
- public DeleteRef ref(String ref) {
- this.refsToDelete.add(ref);
- return this;
+ public void delete(ImmutableSet<String> refsToDelete)
+ throws OrmException, IOException, ResourceConflictException, PermissionBackendException {
+ delete(refsToDelete, null);
}
- public DeleteRef refs(List<String> refs) {
- this.refsToDelete.addAll(refs);
- return this;
- }
-
- public DeleteRef prefix(String prefix) {
- this.prefix = prefix;
- return this;
- }
-
- public void delete()
+ public void delete(ImmutableSet<String> refsToDelete, @Nullable String prefix)
throws OrmException, IOException, ResourceConflictException, PermissionBackendException {
if (!refsToDelete.isEmpty()) {
try (Repository r = repoManager.openRepository(resource.getNameKey())) {
if (refsToDelete.size() == 1) {
- deleteSingleRef(r);
+ deleteSingleRef(r, Iterables.getOnlyElement(refsToDelete), prefix);
} else {
- deleteMultipleRefs(r);
+ deleteMultipleRefs(r, refsToDelete, prefix);
}
}
}
}
- private void deleteSingleRef(Repository r) throws IOException, ResourceConflictException {
- String ref = refsToDelete.get(0);
+ private void deleteSingleRef(Repository r, String ref, String prefix)
+ throws IOException, ResourceConflictException {
if (prefix != null && !ref.startsWith(R_REFS)) {
ref = prefix + ref;
}
@@ -177,17 +165,17 @@
}
}
- private void deleteMultipleRefs(Repository r)
+ private void deleteMultipleRefs(Repository r, ImmutableSet<String> refsToDelete, String prefix)
throws OrmException, IOException, ResourceConflictException, PermissionBackendException {
BatchRefUpdate batchUpdate = r.getRefDatabase().newBatchUpdate();
batchUpdate.setAtomic(false);
- List<String> refs =
+ ImmutableSet<String> refs =
prefix == null
? refsToDelete
: refsToDelete
.stream()
.map(ref -> ref.startsWith(R_REFS) ? ref : prefix + ref)
- .collect(toList());
+ .collect(toImmutableSet());
for (String ref : refs) {
batchUpdate.addCommand(createDeleteCommand(resource, r, ref));
}
diff --git a/java/com/google/gerrit/server/restapi/project/DeleteTag.java b/java/com/google/gerrit/server/restapi/project/DeleteTag.java
index bd5f444..4cb7319 100644
--- a/java/com/google/gerrit/server/restapi/project/DeleteTag.java
+++ b/java/com/google/gerrit/server/restapi/project/DeleteTag.java
@@ -16,6 +16,7 @@
import static com.google.gerrit.reviewdb.client.RefNames.isConfigRef;
+import com.google.common.collect.ImmutableSet;
import com.google.gerrit.extensions.common.Input;
import com.google.gerrit.extensions.restapi.MethodNotAllowedException;
import com.google.gerrit.extensions.restapi.Response;
@@ -59,7 +60,7 @@
.ref(tag)
.check(RefPermission.DELETE);
resource.getProjectState().checkStatePermitsWrite();
- deleteRefFactory.create(resource).ref(tag).delete();
+ deleteRefFactory.create(resource).delete(ImmutableSet.of(tag));
return Response.none();
}
}
diff --git a/java/com/google/gerrit/server/restapi/project/DeleteTags.java b/java/com/google/gerrit/server/restapi/project/DeleteTags.java
index 83fa1ea..436b59c 100644
--- a/java/com/google/gerrit/server/restapi/project/DeleteTags.java
+++ b/java/com/google/gerrit/server/restapi/project/DeleteTags.java
@@ -16,6 +16,7 @@
import static org.eclipse.jgit.lib.Constants.R_TAGS;
+import com.google.common.collect.ImmutableSet;
import com.google.gerrit.extensions.api.projects.DeleteTagsInput;
import com.google.gerrit.extensions.restapi.BadRequestException;
import com.google.gerrit.extensions.restapi.Response;
@@ -43,7 +44,7 @@
if (input == null || input.tags == null || input.tags.isEmpty()) {
throw new BadRequestException("tags must be specified");
}
- deleteRefFactory.create(project).refs(input.tags).prefix(R_TAGS).delete();
+ deleteRefFactory.create(project).delete(ImmutableSet.copyOf(input.tags), R_TAGS);
return Response.none();
}
}
