From 257d5a92889a500a5ada28f81bd1b4e7e5f6b0b8 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Mon, 22 Aug 2016 18:22:37 +0900 Subject: [PATCH] Remove no longer used AgreementInfoFactory Change-Id: I09734124aa442b0e2e09afb92cf31a1c55ada786 --- .../httpd/rpc/account/AccountModule.java | 1 - .../rpc/account/AgreementInfoFactory.java | 85 ------------------- 2 files changed, 86 deletions(-) delete mode 100644 gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/account/AgreementInfoFactory.java diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/account/AccountModule.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/account/AccountModule.java index 2536014035..d32fdaf07a 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/account/AccountModule.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/account/AccountModule.java @@ -28,7 +28,6 @@ public class AccountModule extends RpcServletModule { install(new FactoryModule() { @Override protected void configure() { - factory(AgreementInfoFactory.Factory.class); factory(DeleteExternalIds.Factory.class); factory(ExternalIdDetailFactory.Factory.class); } diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/account/AgreementInfoFactory.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/account/AgreementInfoFactory.java deleted file mode 100644 index 91afd97ba1..0000000000 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/account/AgreementInfoFactory.java +++ /dev/null @@ -1,85 +0,0 @@ -// Copyright (C) 2009 The Android Open Source Project -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package com.google.gerrit.httpd.rpc.account; - -import com.google.gerrit.common.data.AgreementInfo; -import com.google.gerrit.common.data.ContributorAgreement; -import com.google.gerrit.common.data.PermissionRule; -import com.google.gerrit.common.data.PermissionRule.Action; -import com.google.gerrit.httpd.rpc.Handler; -import com.google.gerrit.reviewdb.client.AccountGroup; -import com.google.gerrit.server.IdentifiedUser; -import com.google.gerrit.server.project.ProjectCache; -import com.google.inject.Inject; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -class AgreementInfoFactory extends Handler { - private static final Logger log = LoggerFactory.getLogger(AgreementInfoFactory.class); - - interface Factory { - AgreementInfoFactory create(); - } - - private final IdentifiedUser user; - private final ProjectCache projectCache; - - private AgreementInfo info; - - @Inject - AgreementInfoFactory(final IdentifiedUser user, - final ProjectCache projectCache) { - this.user = user; - this.projectCache = projectCache; - } - - @Override - public AgreementInfo call() throws Exception { - List accepted = new ArrayList<>(); - Map agreements = new HashMap<>(); - Collection cas = - projectCache.getAllProjects().getConfig().getContributorAgreements(); - for (ContributorAgreement ca : cas) { - agreements.put(ca.getName(), ca.forUi()); - - List groupIds = new ArrayList<>(); - for (PermissionRule rule : ca.getAccepted()) { - if ((rule.getAction() == Action.ALLOW) && (rule.getGroup() != null)) { - if (rule.getGroup().getUUID() == null) { - log.warn("group \"" + rule.getGroup().getName() + "\" does not " + - " exist, referenced in CLA \"" + ca.getName() + "\""); - } else { - groupIds.add(new AccountGroup.UUID(rule.getGroup().getUUID().get())); - } - } - } - if (user.getEffectiveGroups().containsAnyOf(groupIds)) { - accepted.add(ca.getName()); - } - } - - info = new AgreementInfo(); - info.setAccepted(accepted); - info.setAgreements(agreements); - return info; - } -}