opendev/gerrit
Code Issues Proposed changes

Rename CapabilityControl to AccountLimits

Browse Source 
The class no longer controls capabilities. It now only provides
limits over server resources consumed during a request.

Change-Id: I70408bd5dda68b05502c4ece989b60f55793a8dd
This commit is contained in:
Shawn Pearce
2017-04-29 15:22:21 -07:00
committed by David Pursehouse
parent 8800928410
commit ee59afd5ab
10 changed files with 49 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/ProjectQoSFilter.java
View File

@@ -20,7 +20,7 @@ import static java.util.concurrent.TimeUnit.MINUTES;
import static javax.servlet.http.HttpServletResponse.SC_SERVICE_UNAVAILABLE;
import com.google.gerrit.server.CurrentUser;
import com.google.gerrit.server.account.CapabilityControl;
import com.google.gerrit.server.account.AccountLimits;
import com.google.gerrit.server.config.GerritServerConfig;
import com.google.gerrit.server.git.QueueProvider;
import com.google.gerrit.server.git.WorkQueue.CancelableRunnable;
@@ -78,7 +78,7 @@ public class ProjectQoSFilter implements Filter {
}
}
private final CapabilityControl.Factory capabilityFactory;
private final AccountLimits.Factory limitsFactory;
private final Provider<CurrentUser> user;
private final QueueProvider queue;
private final ServletContext context;
@@ -86,12 +86,12 @@ public class ProjectQoSFilter implements Filter {
@Inject
ProjectQoSFilter(
CapabilityControl.Factory capabilityFactory,
AccountLimits.Factory limitsFactory,
Provider<CurrentUser> user,
QueueProvider queue,
ServletContext context,
@GerritServerConfig Config cfg) {
this.capabilityFactory = capabilityFactory;
this.limitsFactory = limitsFactory;
this.user = user;
this.queue = queue;
this.context = context;
@@ -138,7 +138,7 @@ public class ProjectQoSFilter implements Filter {
}
private ScheduledThreadPoolExecutor getExecutor() {
QueueProvider.QueueType qt = capabilityFactory.create(user.get()).getQueueType();
QueueProvider.QueueType qt = limitsFactory.create(user.get()).getQueueType();
return queue.getQueue(qt);
}