From 01eac64ee1739412f423569d5eac2f7a066d1fe2 Mon Sep 17 00:00:00 2001 From: Bruce Zu Date: Wed, 20 Feb 2013 13:01:47 +0800 Subject: [PATCH] Rename CreateProject to PerformCreateProject As a preparatory step for "Add REST API for 'create project' on WebUI" where there is a new CreateProject which implements RestModifyView. Change-Id: I047cd7c9d2c8d0b779d1aa65d89600a6d4abbbaa --- .../gerrit/httpd/rpc/project/CreateProjectHandler.java | 8 ++++---- .../google/gerrit/server/config/GerritRequestModule.java | 4 ++-- .../{CreateProject.java => PerformCreateProject.java} | 8 ++++---- .../google/gerrit/sshd/commands/CreateProjectCommand.java | 7 +++---- 4 files changed, 13 insertions(+), 14 deletions(-) rename gerrit-server/src/main/java/com/google/gerrit/server/project/{CreateProject.java => PerformCreateProject.java} (97%) diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/CreateProjectHandler.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/CreateProjectHandler.java index 141f33234a..149c866ace 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/CreateProjectHandler.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/CreateProjectHandler.java @@ -18,7 +18,7 @@ import com.google.gerrit.common.errors.ProjectCreationFailedException; import com.google.gerrit.httpd.rpc.Handler; import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.reviewdb.client.Project.SubmitType; -import com.google.gerrit.server.project.CreateProject; +import com.google.gerrit.server.project.PerformCreateProject; import com.google.gerrit.server.project.CreateProjectArgs; import com.google.gerrit.server.project.NoSuchProjectException; import com.google.gerrit.server.project.ProjectControl; @@ -37,7 +37,7 @@ public class CreateProjectHandler extends Handler { @Assisted("permissionsOnly") boolean permissionsOnly); } - private final CreateProject.Factory createProjectFactory; + private final PerformCreateProject.Factory createProjectFactory; private final ProjectControl.Factory projectControlFactory; private final String projectName; private final String parentName; @@ -45,7 +45,7 @@ public class CreateProjectHandler extends Handler { private final boolean permissionsOnly; @Inject - public CreateProjectHandler(final CreateProject.Factory createProjectFactory, + public CreateProjectHandler(final PerformCreateProject.Factory createProjectFactory, final ProjectControl.Factory projectControlFactory, @Assisted("projectName") final String projectName, @Assisted("parentName") final String parentName, @@ -78,7 +78,7 @@ public class CreateProjectHandler extends Handler { args.createEmptyCommit = emptyCommit; args.permissionsOnly = permissionsOnly; - final CreateProject createProject = createProjectFactory.create(args); + final PerformCreateProject createProject = createProjectFactory.create(args); createProject.createProject(); return VoidResult.INSTANCE; } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/GerritRequestModule.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/GerritRequestModule.java index 18e5e1f8a4..38489edc48 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/config/GerritRequestModule.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/GerritRequestModule.java @@ -27,7 +27,7 @@ import com.google.gerrit.server.git.MetaDataUpdate; import com.google.gerrit.server.git.SubmoduleOp; import com.google.gerrit.server.patch.RemoveReviewer; import com.google.gerrit.server.project.ChangeControl; -import com.google.gerrit.server.project.CreateProject; +import com.google.gerrit.server.project.PerformCreateProject; import com.google.gerrit.server.project.PerRequestProjectControlCache; import com.google.gerrit.server.project.ProjectControl; import com.google.gerrit.server.project.SuggestParentCandidates; @@ -56,7 +56,7 @@ public class GerritRequestModule extends FactoryModule { factory(DeleteDraftPatchSet.Factory.class); factory(PublishDraft.Factory.class); factory(RemoveReviewer.Factory.class); - factory(CreateProject.Factory.class); + factory(PerformCreateProject.Factory.class); factory(SuggestParentCandidates.Factory.class); factory(BanCommit.Factory.class); } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/CreateProject.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/PerformCreateProject.java similarity index 97% rename from gerrit-server/src/main/java/com/google/gerrit/server/project/CreateProject.java rename to gerrit-server/src/main/java/com/google/gerrit/server/project/PerformCreateProject.java index c105873812..6f2a83442d 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/CreateProject.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/PerformCreateProject.java @@ -59,12 +59,12 @@ import java.util.Set; /** Common class that holds the code to create projects */ -public class CreateProject { +public class PerformCreateProject { private static final Logger log = LoggerFactory - .getLogger(CreateProject.class); + .getLogger(PerformCreateProject.class); public interface Factory { - CreateProject create(CreateProjectArgs createProjectArgs); + PerformCreateProject create(CreateProjectArgs createProjectArgs); } private final Set projectOwnerGroups; @@ -79,7 +79,7 @@ public class CreateProject { private MetaDataUpdate.User metaDataUpdateFactory; @Inject - CreateProject(@ProjectOwnerGroups Set pOwnerGroups, + PerformCreateProject(@ProjectOwnerGroups Set pOwnerGroups, IdentifiedUser identifiedUser, GitRepositoryManager gitRepoManager, GitReferenceUpdated referenceUpdated, DynamicSet createdListener, diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/CreateProjectCommand.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/CreateProjectCommand.java index fc7a3c73bf..bd624ae747 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/CreateProjectCommand.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/CreateProjectCommand.java @@ -21,7 +21,7 @@ import com.google.gerrit.reviewdb.client.AccountGroup; import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.reviewdb.client.Project.InheritableBoolean; import com.google.gerrit.reviewdb.client.Project.SubmitType; -import com.google.gerrit.server.project.CreateProject; +import com.google.gerrit.server.project.PerformCreateProject; import com.google.gerrit.server.project.CreateProjectArgs; import com.google.gerrit.server.project.ProjectControl; import com.google.gerrit.server.project.SuggestParentCandidates; @@ -118,7 +118,7 @@ final class CreateProjectCommand extends SshCommand { } @Inject - private CreateProject.Factory CreateProjectFactory; + private PerformCreateProject.Factory factory; @Inject private SuggestParentCandidates.Factory suggestParentCandidatesFactory; @@ -144,8 +144,7 @@ final class CreateProjectCommand extends SshCommand { args.branch = branch; args.createEmptyCommit = createEmptyCommit; - final CreateProject createProject = - CreateProjectFactory.create(args); + final PerformCreateProject createProject = factory.create(args); createProject.createProject(); } else { List parentCandidates =