Annotate REST resource creation implementations as @Singleton

In change I5cd61f77a resource creation implementations were modified
to no longer require creation by factories, due to no longer keeping
any state.  Those classes can now be annotated as @Singleton, but
this was missed.

Change-Id: Icfb0741af5422d8319d21670f08c48f0bd4d2f86
This commit is contained in:
David Pursehouse 2018-08-22 12:01:11 +09:00
parent 07bbde2852
commit 84dcede927
9 changed files with 17 additions and 0 deletions

View File

@ -27,6 +27,7 @@ import com.google.gerrit.extensions.restapi.RestModifyView;
import com.google.gerrit.extensions.restapi.TopLevelResource;
import com.google.inject.Inject;
import com.google.inject.Provider;
import com.google.inject.Singleton;
import java.io.IOException;
import java.io.InputStream;
import java.io.PrintWriter;
@ -94,6 +95,7 @@ public class InstallPlugin implements RestModifyView<TopLevelResource, InstallPl
}
@RequiresCapability(GlobalCapability.ADMINISTRATE_SERVER)
@Singleton
static class Create
implements RestCollectionCreateView<TopLevelResource, PluginResource, InstallPluginInput> {
private final PluginLoader loader;
@ -114,6 +116,7 @@ public class InstallPlugin implements RestModifyView<TopLevelResource, InstallPl
}
@RequiresCapability(GlobalCapability.ADMINISTRATE_SERVER)
@Singleton
static class Overwrite implements RestModifyView<PluginResource, InstallPluginInput> {
private final Provider<InstallPlugin> install;

View File

@ -55,6 +55,7 @@ import com.google.gerrit.server.ssh.SshKeyCache;
import com.google.gwtorm.server.OrmException;
import com.google.inject.Inject;
import com.google.inject.Provider;
import com.google.inject.Singleton;
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashSet;
@ -63,6 +64,7 @@ import java.util.Set;
import org.eclipse.jgit.errors.ConfigInvalidException;
@RequiresCapability(GlobalCapability.CREATE_ACCOUNT)
@Singleton
public class CreateAccount
implements RestCollectionCreateView<TopLevelResource, AccountResource, AccountInput> {
private final Sequences seq;

View File

@ -44,9 +44,11 @@ import com.google.gerrit.server.permissions.PermissionBackendException;
import com.google.gwtorm.server.OrmException;
import com.google.inject.Inject;
import com.google.inject.Provider;
import com.google.inject.Singleton;
import java.io.IOException;
import org.eclipse.jgit.errors.ConfigInvalidException;
@Singleton
public class CreateEmail
implements RestCollectionCreateView<AccountResource, AccountResource.Email, EmailInput> {
private static final FluentLogger logger = FluentLogger.forEnclosingClass();

View File

@ -216,6 +216,7 @@ public class AddMembers implements RestModifyView<GroupResource, Input> {
return result;
}
@Singleton
public static class CreateMember
implements RestCollectionCreateView<GroupResource, MemberResource, Input> {
private final AddMembers put;

View File

@ -131,6 +131,7 @@ public class AddSubgroups implements RestModifyView<GroupResource, Input> {
groupsUpdateProvider.get().updateGroup(parentGroupUuid, groupUpdate);
}
@Singleton
public static class CreateSubgroup
implements RestCollectionCreateView<GroupResource, SubgroupResource, Input> {
private final AddSubgroups addSubgroups;

View File

@ -57,6 +57,7 @@ import com.google.gwtorm.server.OrmDuplicateKeyException;
import com.google.gwtorm.server.OrmException;
import com.google.inject.Inject;
import com.google.inject.Provider;
import com.google.inject.Singleton;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
@ -69,6 +70,7 @@ import org.eclipse.jgit.lib.Config;
import org.eclipse.jgit.lib.PersonIdent;
@RequiresCapability(GlobalCapability.CREATE_GROUP)
@Singleton
public class CreateGroup
implements RestCollectionCreateView<TopLevelResource, GroupResource, GroupInput> {
private final Provider<IdentifiedUser> self;

View File

@ -41,6 +41,7 @@ import com.google.gerrit.server.project.RefValidationHelper;
import com.google.gerrit.server.util.MagicBranch;
import com.google.inject.Inject;
import com.google.inject.Provider;
import com.google.inject.Singleton;
import java.io.IOException;
import org.eclipse.jgit.errors.IncorrectObjectTypeException;
import org.eclipse.jgit.lib.Constants;
@ -51,6 +52,7 @@ import org.eclipse.jgit.revwalk.RevObject;
import org.eclipse.jgit.revwalk.RevWalk;
import org.eclipse.jgit.transport.ReceiveCommand;
@Singleton
public class CreateBranch
implements RestCollectionCreateView<ProjectResource, BranchResource, BranchInput> {
private static final FluentLogger logger = FluentLogger.forEnclosingClass();

View File

@ -72,6 +72,7 @@ import com.google.gerrit.server.validators.ProjectCreationValidationListener;
import com.google.gerrit.server.validators.ValidationException;
import com.google.inject.Inject;
import com.google.inject.Provider;
import com.google.inject.Singleton;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
@ -90,6 +91,7 @@ import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.transport.ReceiveCommand;
@RequiresCapability(GlobalCapability.CREATE_PROJECT)
@Singleton
public class CreateProject
implements RestCollectionCreateView<TopLevelResource, ProjectResource, ProjectInput> {
private static final FluentLogger logger = FluentLogger.forEnclosingClass();

View File

@ -41,6 +41,7 @@ import com.google.gerrit.server.project.RefUtil;
import com.google.gerrit.server.project.RefUtil.InvalidRevisionException;
import com.google.gerrit.server.project.TagResource;
import com.google.inject.Inject;
import com.google.inject.Singleton;
import java.io.IOException;
import java.util.TimeZone;
import org.eclipse.jgit.api.Git;
@ -53,6 +54,7 @@ import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.revwalk.RevObject;
import org.eclipse.jgit.revwalk.RevWalk;
@Singleton
public class CreateTag implements RestCollectionCreateView<ProjectResource, TagResource, TagInput> {
private static final FluentLogger logger = FluentLogger.forEnclosingClass();
private final PermissionBackend permissionBackend;