opendev/gerrit
Code Issues Proposed changes

SystemInfoService{Impl}: Remove unused contributorAgreements method

Browse Source 
Change-Id: Ib999603a21788ab48afe4a7d0d4a44196b4bef68
This commit is contained in:
David Pursehouse
2016-08-22 23:47:19 +09:00
parent bfc0c378bc
commit f801131ab2
2 changed files with 1 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gerrit-common/src/main/java/com/google/gerrit/common/data/SystemInfoService.java
View File

@@ -14,7 +14,6 @@
package com.google.gerrit.common.data; package com.google.gerrit.common.data;
import com.google.gerrit.common.auth.SignInRequired;
import com.google.gwtjsonrpc.common.AllowCrossSiteRequest; import com.google.gwtjsonrpc.common.AllowCrossSiteRequest;
import com.google.gwtjsonrpc.common.AsyncCallback; import com.google.gwtjsonrpc.common.AsyncCallback;
import com.google.gwtjsonrpc.common.RemoteJsonService; import com.google.gwtjsonrpc.common.RemoteJsonService;
@@ -29,8 +28,5 @@ public interface SystemInfoService extends RemoteJsonService {
@AllowCrossSiteRequest @AllowCrossSiteRequest
void daemonHostKeys(AsyncCallback<List<SshHostKey>> callback); void daemonHostKeys(AsyncCallback<List<SshHostKey>> callback);
@SignInRequired
void contributorAgreements(AsyncCallback<List<ContributorAgreement>> callback);
void clientError(String message, AsyncCallback<VoidResult> callback); void clientError(String message, AsyncCallback<VoidResult> callback);
} }

22
gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/SystemInfoServiceImpl.java
View File

@@ -14,11 +14,8 @@
package com.google.gerrit.httpd.rpc; package com.google.gerrit.httpd.rpc;
import com.google.common.collect.Lists;
import com.google.gerrit.common.data.ContributorAgreement;
import com.google.gerrit.common.data.SshHostKey; import com.google.gerrit.common.data.SshHostKey;
import com.google.gerrit.common.data.SystemInfoService; import com.google.gerrit.common.data.SystemInfoService;
import com.google.gerrit.server.project.ProjectCache;
import com.google.gerrit.server.ssh.SshInfo; import com.google.gerrit.server.ssh.SshInfo;
import com.google.gwtjsonrpc.common.AsyncCallback; import com.google.gwtjsonrpc.common.AsyncCallback;
import com.google.gwtjsonrpc.common.VoidResult; import com.google.gwtjsonrpc.common.VoidResult;
@@ -32,7 +29,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection;
import java.util.List; import java.util.List;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
@@ -45,28 +41,12 @@ class SystemInfoServiceImpl implements SystemInfoService {
private final List<HostKey> hostKeys; private final List<HostKey> hostKeys;
private final Provider<HttpServletRequest> httpRequest; private final Provider<HttpServletRequest> httpRequest;
private final ProjectCache projectCache;
@Inject @Inject
SystemInfoServiceImpl(SshInfo daemon, SystemInfoServiceImpl(SshInfo daemon,
Provider<HttpServletRequest> hsr, Provider<HttpServletRequest> hsr) {
ProjectCache pc) {
hostKeys = daemon.getHostKeys(); hostKeys = daemon.getHostKeys();
httpRequest = hsr; httpRequest = hsr;
projectCache = pc;
}
@Override
public void contributorAgreements(
final AsyncCallback<List<ContributorAgreement>> callback) {
Collection<ContributorAgreement> agreements =
projectCache.getAllProjects().getConfig().getContributorAgreements();
List<ContributorAgreement> cas =
Lists.newArrayListWithCapacity(agreements.size());
for (ContributorAgreement ca : agreements) {
cas.add(ca.forUi());
}
callback.onSuccess(cas);
} }
@Override @Override