From 0557fc43c3a28c387967e02d91d70014e88bb565 Mon Sep 17 00:00:00 2001 From: Dave Borowitz Date: Tue, 5 Feb 2013 17:20:55 -0800 Subject: [PATCH] Rename ApprovalType(s) to LabelType(s) Change-Id: Icb860eb84d481d519aa0facbef99392b45784843 --- .../gerrit/common/data/GerritConfig.java | 10 ++-- .../{ApprovalType.java => LabelType.java} | 26 +++++----- .../{ApprovalTypes.java => LabelTypes.java} | 38 +++++++------- .../client/admin/AccessSectionEditor.java | 5 +- .../gerrit/client/admin/PermissionEditor.java | 10 ++-- .../gerrit/client/changes/ApprovalTable.java | 18 ++----- .../gerrit/client/changes/ChangeTable.java | 12 ++--- .../client/changes/PublishCommentScreen.java | 8 +-- .../gerrit/httpd/GerritConfigProvider.java | 10 ++-- .../PatchSetPublishDetailFactory.java | 14 ++--- .../rpc/patch/PatchDetailServiceImpl.java | 12 ++--- .../gerrit/common/ChangeHookRunner.java | 16 +++--- .../google/gerrit/server/ApprovalsUtil.java | 14 ++--- .../gerrit/server/change/ChangeJson.java | 38 +++++++------- .../gerrit/server/change/LabelOrdering.java | 10 ++-- .../gerrit/server/change/PostReview.java | 42 +++++++-------- .../gerrit/server/change/PostReviewers.java | 6 +-- .../gerrit/server/change/ReviewerJson.java | 16 +++--- .../server/config/GerritGlobalModule.java | 4 +- ...sProvider.java => LabelTypesProvider.java} | 16 +++--- .../gerrit/server/events/EventFactory.java | 16 +++--- .../google/gerrit/server/git/CherryPick.java | 10 ++-- .../com/google/gerrit/server/git/MergeOp.java | 14 ++--- .../google/gerrit/server/git/MergeUtil.java | 12 ++--- .../server/git/ReviewNoteHeaderFormatter.java | 4 +- .../server/git/SubmitStrategyFactory.java | 10 ++-- .../gerrit/server/mail/MergedSender.java | 14 ++--- .../query/change/ChangeQueryBuilder.java | 10 ++-- .../server/query/change/LabelPredicate.java | 24 ++++----- .../server/workflow/CategoryFunction.java | 8 +-- .../gerrit/server/workflow/FunctionState.java | 52 +++++++++---------- .../gerrit/server/workflow/MaxNoBlock.java | 12 ++--- .../gerrit/server/workflow/MaxWithBlock.java | 14 ++--- .../gerrit/server/workflow/NoBlock.java | 6 +-- .../gerrit/server/workflow/NoOpFunction.java | 4 +- .../gerrit/PRED__load_commit_labels_1.java | 8 +-- .../PRED_get_legacy_approval_types_1.java | 10 ++-- .../google/gerrit/rules/GerritCommonTest.java | 12 ++--- .../gerrit/sshd/commands/ApproveOption.java | 6 +-- .../gerrit/sshd/commands/ReviewCommand.java | 8 +-- 40 files changed, 286 insertions(+), 293 deletions(-) rename gerrit-common/src/main/java/com/google/gerrit/common/data/{ApprovalType.java => LabelType.java} (90%) rename gerrit-common/src/main/java/com/google/gerrit/common/data/{ApprovalTypes.java => LabelTypes.java} (56%) rename gerrit-server/src/main/java/com/google/gerrit/server/config/{ApprovalTypesProvider.java => LabelTypesProvider.java} (78%) diff --git a/gerrit-common/src/main/java/com/google/gerrit/common/data/GerritConfig.java b/gerrit-common/src/main/java/com/google/gerrit/common/data/GerritConfig.java index fb9feb4aba..1e9ac6c201 100644 --- a/gerrit-common/src/main/java/com/google/gerrit/common/data/GerritConfig.java +++ b/gerrit-common/src/main/java/com/google/gerrit/common/data/GerritConfig.java @@ -46,7 +46,7 @@ public class GerritConfig implements Cloneable { protected String sshdAddress; protected String editFullNameUrl; protected Project.NameKey wildProject; - protected ApprovalTypes approvalTypes; + protected LabelTypes labelTypes; protected Set editableAccountFields; protected List commentLinks; protected boolean documentationAvailable; @@ -196,12 +196,12 @@ public class GerritConfig implements Cloneable { wildProject = wp; } - public ApprovalTypes getApprovalTypes() { - return approvalTypes; + public LabelTypes getLabelTypes() { + return labelTypes; } - public void setApprovalTypes(final ApprovalTypes at) { - approvalTypes = at; + public void setLabelTypes(final LabelTypes at) { + labelTypes = at; } public boolean canEdit(final Account.FieldName f) { diff --git a/gerrit-common/src/main/java/com/google/gerrit/common/data/ApprovalType.java b/gerrit-common/src/main/java/com/google/gerrit/common/data/LabelType.java similarity index 90% rename from gerrit-common/src/main/java/com/google/gerrit/common/data/ApprovalType.java rename to gerrit-common/src/main/java/com/google/gerrit/common/data/LabelType.java index 99c32f568a..ad94a13ead 100644 --- a/gerrit-common/src/main/java/com/google/gerrit/common/data/ApprovalType.java +++ b/gerrit-common/src/main/java/com/google/gerrit/common/data/LabelType.java @@ -25,29 +25,29 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -public class ApprovalType { - public static ApprovalType fromApprovalCategory(ApprovalCategory ac, +public class LabelType { + public static LabelType fromApprovalCategory(ApprovalCategory ac, List acvs) { List values = new ArrayList(acvs.size()); for (ApprovalCategoryValue acv : acvs) { values.add( new LabelValue(acv.getValue(), acv.getName())); } - ApprovalType at = - new ApprovalType(ac.getId().get(), ac.getLabelName(), values); - at.setAbbreviatedName(ac.getAbbreviatedName()); - at.setFunctionName(ac.getFunctionName()); - at.setCopyMinScore(ac.isCopyMinScore()); - at.setPosition(ac.getPosition()); - return at; + LabelType lt = new LabelType(ac.getId().get(), ac.getLabelName(), values); + lt.setAbbreviatedName(ac.getAbbreviatedName()); + lt.setFunctionName(ac.getFunctionName()); + lt.setCopyMinScore(ac.isCopyMinScore()); + lt.setPosition(ac.getPosition()); + return lt; } - public static ApprovalType withDefaultValues(String id, String name) { + public static LabelType withDefaultValues(String id, String name) { + checkId(id); checkName(name); List values = new ArrayList(2); values.add(new LabelValue((short) 0, "Rejected")); values.add(new LabelValue((short) 1, "Approved")); - return new ApprovalType(id, name, values); + return new LabelType(id, name, values); } private static String checkId(String id) { @@ -101,10 +101,10 @@ public class ApprovalType { private transient List intList; private transient Map byValue; - protected ApprovalType() { + protected LabelType() { } - public ApprovalType(String id, String name, List valueList) { + public LabelType(String id, String name, List valueList) { this.id = checkId(id); this.name = checkName(name); values = new ArrayList(valueList); diff --git a/gerrit-common/src/main/java/com/google/gerrit/common/data/ApprovalTypes.java b/gerrit-common/src/main/java/com/google/gerrit/common/data/LabelTypes.java similarity index 56% rename from gerrit-common/src/main/java/com/google/gerrit/common/data/ApprovalTypes.java rename to gerrit-common/src/main/java/com/google/gerrit/common/data/LabelTypes.java index 7461101e1f..602b362238 100644 --- a/gerrit-common/src/main/java/com/google/gerrit/common/data/ApprovalTypes.java +++ b/gerrit-common/src/main/java/com/google/gerrit/common/data/LabelTypes.java @@ -18,32 +18,32 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -public class ApprovalTypes { - protected List approvalTypes; - private transient Map byId; - private transient Map byLabel; +public class LabelTypes { + protected List labelTypes; + private transient Map byId; + private transient Map byLabel; - protected ApprovalTypes() { + protected LabelTypes() { } - public ApprovalTypes(final List approvals) { - approvalTypes = approvals; + public LabelTypes(final List approvals) { + labelTypes = approvals; byId(); } - public List getApprovalTypes() { - return approvalTypes; + public List getLabelTypes() { + return labelTypes; } - public ApprovalType byId(String id) { + public LabelType byId(String id) { return byId().get(id); } - private Map byId() { + private Map byId() { if (byId == null) { - byId = new HashMap(); - if (approvalTypes != null) { - for (final ApprovalType t : approvalTypes) { + byId = new HashMap(); + if (labelTypes != null) { + for (final LabelType t : labelTypes) { byId.put(t.getId(), t); } } @@ -51,15 +51,15 @@ public class ApprovalTypes { return byId; } - public ApprovalType byLabel(String labelName) { + public LabelType byLabel(String labelName) { return byLabel().get(labelName.toLowerCase()); } - private Map byLabel() { + private Map byLabel() { if (byLabel == null) { - byLabel = new HashMap(); - if (approvalTypes != null) { - for (ApprovalType t : approvalTypes) { + byLabel = new HashMap(); + if (labelTypes != null) { + for (LabelType t : labelTypes) { byLabel.put(t.getName().toLowerCase(), t); } } diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AccessSectionEditor.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AccessSectionEditor.java index 577f40bcb9..e63903ff5d 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AccessSectionEditor.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AccessSectionEditor.java @@ -16,7 +16,7 @@ package com.google.gerrit.client.admin; import com.google.gerrit.client.Gerrit; import com.google.gerrit.common.data.AccessSection; -import com.google.gerrit.common.data.ApprovalType; +import com.google.gerrit.common.data.LabelType; import com.google.gerrit.common.data.Permission; import com.google.gerrit.common.data.ProjectAccess; import com.google.gerrit.common.data.RefConfigSection; @@ -226,8 +226,7 @@ public class AccessSectionEditor extends Composite implements addPermission(varName, perms); } } else if (RefConfigSection.isValid(value.getName())) { - for (ApprovalType t : Gerrit.getConfig().getApprovalTypes() - .getApprovalTypes()) { + for (LabelType t : Gerrit.getConfig().getLabelTypes().getLabelTypes()) { addPermission(Permission.LABEL + t.getName(), perms); } for (String varName : Util.C.permissionNames().keySet()) { diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/PermissionEditor.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/PermissionEditor.java index 2c43233275..90526390f4 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/PermissionEditor.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/PermissionEditor.java @@ -18,7 +18,7 @@ import com.google.gerrit.client.Gerrit; import com.google.gerrit.client.rpc.GerritCallback; import com.google.gerrit.client.ui.SuggestUtil; import com.google.gerrit.common.data.AccessSection; -import com.google.gerrit.common.data.ApprovalType; +import com.google.gerrit.common.data.LabelType; import com.google.gerrit.common.data.GlobalCapability; import com.google.gerrit.common.data.GroupReference; import com.google.gerrit.common.data.Permission; @@ -260,12 +260,12 @@ public class PermissionEditor extends Composite implements Editor, this.value = value; if (value.isLabel()) { - ApprovalType at = Gerrit.getConfig().getApprovalTypes().byLabel(value.getLabel()); - if (at != null) { + LabelType lt = Gerrit.getConfig().getLabelTypes().byLabel(value.getLabel()); + if (lt != null) { validRange = new PermissionRange.WithDefaults( value.getName(), - at.getMin().getValue(), at.getMax().getValue(), - at.getMin().getValue(), at.getMax().getValue()); + lt.getMin().getValue(), lt.getMax().getValue(), + lt.getMin().getValue(), lt.getMax().getValue()); } } else if (GlobalCapability.isCapability(value.getName())) { validRange = GlobalCapability.getRange(value.getName()); diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ApprovalTable.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ApprovalTable.java index 393f9cef7e..26b294e2c1 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ApprovalTable.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ApprovalTable.java @@ -30,8 +30,8 @@ import com.google.gerrit.client.ui.AccountLink; import com.google.gerrit.client.ui.AddMemberBox; import com.google.gerrit.client.ui.ReviewerSuggestOracle; import com.google.gerrit.common.data.ApprovalDetail; -import com.google.gerrit.common.data.ApprovalType; -import com.google.gerrit.common.data.ApprovalTypes; +import com.google.gerrit.common.data.LabelType; +import com.google.gerrit.common.data.LabelTypes; import com.google.gerrit.common.data.SubmitRecord; import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.reviewdb.client.Change; @@ -62,14 +62,7 @@ import java.util.Set; /** Displays a table of {@link ApprovalDetail} objects for a change record. */ public class ApprovalTable extends Composite { - static short parseLabelValue(String value) { - if (value.charAt(0) == ' ' || value.charAt(0) == '+') { - value = value.substring(1); - } - return Short.parseShort(value); - } - - private final ApprovalTypes types; + private final LabelTypes types; private final Grid table; private final Widget missing; private final Panel addReviewer; @@ -80,7 +73,7 @@ public class ApprovalTable extends Composite { public ApprovalTable() { rows = new HashMap(); - types = Gerrit.getConfig().getApprovalTypes(); + types = Gerrit.getConfig().getLabelTypes(); table = new Grid(1, 3); table.addStyleName(Gerrit.RESOURCES.css().infoTable()); @@ -371,8 +364,7 @@ public class ApprovalTable extends Composite { table.setWidget(row, col, new Image(Gerrit.RESOURCES.greenCheck())); } else { - // TODO: support arbitrary labels. - ApprovalType legacyType = types.byLabel(labelName); + LabelType legacyType = types.byLabel(labelName); if (legacyType == null) { table.clearCell(row, col); col++; diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeTable.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeTable.java index 0d7f8db823..6324e54df6 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeTable.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeTable.java @@ -31,7 +31,7 @@ import com.google.gerrit.common.data.AccountInfo; import com.google.gerrit.common.data.AccountInfoCache; import com.google.gerrit.common.data.ApprovalSummary; import com.google.gerrit.common.data.ApprovalSummarySet; -import com.google.gerrit.common.data.ApprovalType; +import com.google.gerrit.common.data.LabelType; import com.google.gerrit.common.data.ChangeInfo; import com.google.gerrit.common.data.LabelValue; import com.google.gerrit.reviewdb.client.Account; @@ -68,7 +68,7 @@ public class ChangeTable extends NavigationTable { private final List
sections; private AccountInfoCache accountCache = AccountInfoCache.empty(); - private final List approvalTypes; + private final List labelTypes; private final int columns; public ChangeTable() { @@ -77,9 +77,9 @@ public class ChangeTable extends NavigationTable { public ChangeTable(boolean showApprovals) { super(Util.C.changeItemHelp()); - approvalTypes = Gerrit.getConfig().getApprovalTypes().getApprovalTypes(); + labelTypes = Gerrit.getConfig().getLabelTypes().getLabelTypes(); if (showApprovals) { - columns = BASE_COLUMNS + approvalTypes.size(); + columns = BASE_COLUMNS + labelTypes.size(); } else { columns = BASE_COLUMNS; } @@ -96,7 +96,7 @@ public class ChangeTable extends NavigationTable { table.setText(0, C_BRANCH, Util.C.changeTableColumnBranch()); table.setText(0, C_LAST_UPDATE, Util.C.changeTableColumnLastUpdate()); for (int i = BASE_COLUMNS; i < columns; i++) { - final ApprovalType type = approvalTypes.get(i - BASE_COLUMNS); + final LabelType type = labelTypes.get(i - BASE_COLUMNS); String text = type.getAbbreviatedName(); if (text == null) { text = type.getName(); @@ -294,7 +294,7 @@ public class ChangeTable extends NavigationTable { } } - for (final ApprovalType type : approvalTypes) { + for (final LabelType type : labelTypes) { final PatchSetApproval ca = approvals.get(type.getId()); fmt.removeStyleName(row, col, Gerrit.RESOURCES.css().negscore()); diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/PublishCommentScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/PublishCommentScreen.java index 3e19c7af92..f949a85280 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/PublishCommentScreen.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/PublishCommentScreen.java @@ -14,8 +14,6 @@ package com.google.gerrit.client.changes; -import static com.google.gerrit.client.changes.ApprovalTable.parseLabelValue; - import com.google.gerrit.client.Gerrit; import com.google.gerrit.client.changes.ChangeInfo.ApprovalInfo; import com.google.gerrit.client.changes.ChangeInfo.LabelInfo; @@ -466,7 +464,11 @@ public class PublishCommentScreen extends AccountScreen implements } short parseValue() { - return parseLabelValue(value); + String value = this.value; + if (value.startsWith(" ") || value.startsWith("+")) { + value = value.substring(1); + } + return Short.parseShort(value); } } diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/GerritConfigProvider.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/GerritConfigProvider.java index 9b81f0dad3..60179191cd 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/GerritConfigProvider.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/GerritConfigProvider.java @@ -14,7 +14,7 @@ package com.google.gerrit.httpd; -import com.google.gerrit.common.data.ApprovalTypes; +import com.google.gerrit.common.data.LabelTypes; import com.google.gerrit.common.data.GerritConfig; import com.google.gerrit.common.data.GitwebConfig; import com.google.gerrit.reviewdb.client.Account; @@ -52,7 +52,7 @@ class GerritConfigProvider implements Provider { private final GitWebConfig gitWebConfig; private final AllProjectsName wildProject; private final SshInfo sshInfo; - private final ApprovalTypes approvalTypes; + private final LabelTypes labelTypes; private EmailSender emailSender; private final ContactStore contactStore; @@ -62,7 +62,7 @@ class GerritConfigProvider implements Provider { @Inject GerritConfigProvider(final Realm r, @GerritServerConfig final Config gsc, final AuthConfig ac, final GitWebConfig gwc, final AllProjectsName wp, - final SshInfo si, final ApprovalTypes at, final ContactStore cs, + final SshInfo si, final LabelTypes at, final ContactStore cs, final ServletContext sc, final DownloadConfig dc, final @AnonymousCowardName String acn) { realm = r; @@ -72,7 +72,7 @@ class GerritConfigProvider implements Provider { gitWebConfig = gwc; sshInfo = si; wildProject = wp; - approvalTypes = at; + labelTypes = at; contactStore = cs; servletContext = sc; anonymousCowardName = acn; @@ -123,7 +123,7 @@ class GerritConfigProvider implements Provider { config.setDownloadCommands(downloadConfig.getDownloadCommands()); config.setAuthType(authConfig.getAuthType()); config.setWildProject(wildProject); - config.setApprovalTypes(approvalTypes); + config.setLabelTypes(labelTypes); config.setDocumentationAvailable(servletContext .getResource("/Documentation/index.html") != null); config.setTestChangeMerge(cfg.getBoolean("changeMerge", diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/changedetail/PatchSetPublishDetailFactory.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/changedetail/PatchSetPublishDetailFactory.java index fa594cdb89..4755c6f8b3 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/changedetail/PatchSetPublishDetailFactory.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/changedetail/PatchSetPublishDetailFactory.java @@ -14,8 +14,8 @@ package com.google.gerrit.httpd.rpc.changedetail; -import com.google.gerrit.common.data.ApprovalType; -import com.google.gerrit.common.data.ApprovalTypes; +import com.google.gerrit.common.data.LabelType; +import com.google.gerrit.common.data.LabelTypes; import com.google.gerrit.common.data.PatchSetPublishDetail; import com.google.gerrit.common.data.PermissionRange; import com.google.gerrit.common.data.SubmitRecord; @@ -47,7 +47,7 @@ final class PatchSetPublishDetailFactory extends Handler private final PatchSetInfoFactory infoFactory; private final ReviewDb db; private final ChangeControl.Factory changeControlFactory; - private final ApprovalTypes approvalTypes; + private final LabelTypes labelTypes; private final AccountInfoCacheFactory aic; private final IdentifiedUser user; @@ -62,12 +62,12 @@ final class PatchSetPublishDetailFactory extends Handler final ReviewDb db, final AccountInfoCacheFactory.Factory accountInfoCacheFactory, final ChangeControl.Factory changeControlFactory, - final ApprovalTypes approvalTypes, + final LabelTypes labelTypes, final IdentifiedUser user, @Assisted final PatchSet.Id patchSetId) { this.infoFactory = infoFactory; this.db = db; this.changeControlFactory = changeControlFactory; - this.approvalTypes = approvalTypes; + this.labelTypes = labelTypes; this.aic = accountInfoCacheFactory.create(); this.user = user; @@ -124,8 +124,8 @@ final class PatchSetPublishDetailFactory extends Handler boolean canMakeOk = false; PermissionRange range = rangeByName.get(lbl.label); if (range != null) { - ApprovalType at = approvalTypes.byLabel(lbl.label); - if (at == null || at.getMax().getValue() == range.getMax()) { + LabelType lt = labelTypes.byLabel(lbl.label); + if (lt == null || lt.getMax().getValue() == range.getMax()) { canMakeOk = true; } } diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/patch/PatchDetailServiceImpl.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/patch/PatchDetailServiceImpl.java index 85088a5217..0177ac19c2 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/patch/PatchDetailServiceImpl.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/patch/PatchDetailServiceImpl.java @@ -16,7 +16,7 @@ package com.google.gerrit.httpd.rpc.patch; import com.google.gerrit.common.data.ApprovalSummary; import com.google.gerrit.common.data.ApprovalSummarySet; -import com.google.gerrit.common.data.ApprovalTypes; +import com.google.gerrit.common.data.LabelTypes; import com.google.gerrit.common.data.ChangeDetail; import com.google.gerrit.common.data.PatchDetailService; import com.google.gerrit.common.data.PatchScript; @@ -56,7 +56,7 @@ import java.util.Set; class PatchDetailServiceImpl extends BaseServiceImplementation implements PatchDetailService { - private final ApprovalTypes approvalTypes; + private final LabelTypes labelTypes; private final AccountInfoCacheFactory.Factory accountInfoCacheFactory; private final ChangeControl.Factory changeControlFactory; @@ -69,7 +69,7 @@ class PatchDetailServiceImpl extends BaseServiceImplementation implements @Inject PatchDetailServiceImpl(final Provider schema, final Provider currentUser, - final ApprovalTypes approvalTypes, + final LabelTypes labelTypes, final AccountInfoCacheFactory.Factory accountInfoCacheFactory, final ChangeControl.Factory changeControlFactory, final DeleteDraftPatchSet.Factory deleteDraftPatchSetFactory, @@ -78,7 +78,7 @@ class PatchDetailServiceImpl extends BaseServiceImplementation implements final SaveDraft.Factory saveDraftFactory, final ChangeDetailFactory.Factory changeDetailFactory) { super(schema, currentUser); - this.approvalTypes = approvalTypes; + this.labelTypes = labelTypes; this.accountInfoCacheFactory = accountInfoCacheFactory; this.changeControlFactory = changeControlFactory; @@ -189,7 +189,7 @@ class PatchDetailServiceImpl extends BaseServiceImplementation implements continue; } if (change.getStatus().isOpen()) { - fs.normalize(approvalTypes.byId(category.get()), ca); + fs.normalize(labelTypes.byId(category.get()), ca); } if (ca.getValue() == 0) { continue; @@ -235,7 +235,7 @@ class PatchDetailServiceImpl extends BaseServiceImplementation implements continue; } if (change.getStatus().isOpen()) { - fs.normalize(approvalTypes.byId(category.get()), ca); + fs.normalize(labelTypes.byId(category.get()), ca); } if (ca.getValue() == 0) { continue; diff --git a/gerrit-server/src/main/java/com/google/gerrit/common/ChangeHookRunner.java b/gerrit-server/src/main/java/com/google/gerrit/common/ChangeHookRunner.java index 4eb9ae9b36..79a444509a 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/common/ChangeHookRunner.java +++ b/gerrit-server/src/main/java/com/google/gerrit/common/ChangeHookRunner.java @@ -14,8 +14,8 @@ package com.google.gerrit.common; -import com.google.gerrit.common.data.ApprovalType; -import com.google.gerrit.common.data.ApprovalTypes; +import com.google.gerrit.common.data.LabelType; +import com.google.gerrit.common.data.LabelTypes; import com.google.gerrit.common.data.ContributorAgreement; import com.google.gerrit.extensions.events.LifecycleListener; import com.google.gerrit.extensions.registration.DynamicSet; @@ -206,7 +206,7 @@ public class ChangeHookRunner implements ChangeHooks, LifecycleListener { private final AccountCache accountCache; - private final ApprovalTypes approvalTypes; + private final LabelTypes labelTypes; private final EventFactory eventFactory; @@ -233,7 +233,7 @@ public class ChangeHookRunner implements ChangeHooks, LifecycleListener { final @GerritServerConfig Config config, final @AnonymousCowardName String anonymousCowardName, final SitePaths sitePath, final ProjectCache projectCache, - final AccountCache accountCache, final ApprovalTypes approvalTypes, + final AccountCache accountCache, final LabelTypes labelTypes, final EventFactory eventFactory, final SitePaths sitePaths, final DynamicSet unrestrictedListeners) { this.anonymousCowardName = anonymousCowardName; @@ -241,7 +241,7 @@ public class ChangeHookRunner implements ChangeHooks, LifecycleListener { this.hookQueue = queue.createQueue(1, "hook"); this.projectCache = projectCache; this.accountCache = accountCache; - this.approvalTypes = approvalTypes; + this.labelTypes = labelTypes; this.eventFactory = eventFactory; this.sitePaths = sitePath; this.unrestrictedListeners = unrestrictedListeners; @@ -616,9 +616,9 @@ public class ChangeHookRunner implements ChangeHooks, LifecycleListener { Entry approval) { ApprovalAttribute a = new ApprovalAttribute(); a.type = approval.getKey().get(); - ApprovalType at = approvalTypes.byId(approval.getKey().get()); - if (at != null) { - a.description = at.getName(); + LabelType lt = labelTypes.byId(approval.getKey().get()); + if (lt != null) { + a.description = lt.getName(); } a.value = Short.toString(approval.getValue().get()); return a; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/ApprovalsUtil.java b/gerrit-server/src/main/java/com/google/gerrit/server/ApprovalsUtil.java index 9665f66949..078c2262d4 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/ApprovalsUtil.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/ApprovalsUtil.java @@ -17,8 +17,8 @@ package com.google.gerrit.server; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import com.google.gerrit.common.data.ApprovalType; -import com.google.gerrit.common.data.ApprovalTypes; +import com.google.gerrit.common.data.LabelType; +import com.google.gerrit.common.data.LabelTypes; import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.reviewdb.client.Account.Id; import com.google.gerrit.reviewdb.client.ApprovalCategory; @@ -46,12 +46,12 @@ import java.util.Set; */ public class ApprovalsUtil { private final ReviewDb db; - private final ApprovalTypes approvalTypes; + private final LabelTypes labelTypes; @Inject - public ApprovalsUtil(ReviewDb db, ApprovalTypes approvalTypes) { + public ApprovalsUtil(ReviewDb db, LabelTypes labelTypes) { this.db = db; - this.approvalTypes = approvalTypes; + this.labelTypes = labelTypes; } /** @@ -91,7 +91,7 @@ public class ApprovalsUtil { for (PatchSetApproval a : patchSetApprovals) { // ApprovalCategory.SUBMIT is still in db but not relevant in git-store if (!ApprovalCategory.SUBMIT.equals(a.getCategoryId())) { - final ApprovalType type = approvalTypes.byId(a.getCategoryId().get()); + final LabelType type = labelTypes.byId(a.getCategoryId().get()); if (a.getPatchSetId().equals(source) && type.isCopyMinScore() && type.isMaxNegative(a)) { @@ -106,7 +106,7 @@ public class ApprovalsUtil { public void addReviewers(ReviewDb db, Change change, PatchSet ps, PatchSetInfo info, Set wantReviewers, Set existingReviewers) throws OrmException { - List allTypes = approvalTypes.getApprovalTypes(); + List allTypes = labelTypes.getLabelTypes(); if (allTypes.isEmpty()) { return; } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeJson.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeJson.java index 46e75db0e7..1a5d9bbe88 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeJson.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeJson.java @@ -35,8 +35,8 @@ import com.google.common.collect.Maps; import com.google.common.collect.Multimap; import com.google.common.collect.Sets; import com.google.gerrit.common.changes.ListChangesOption; -import com.google.gerrit.common.data.ApprovalType; -import com.google.gerrit.common.data.ApprovalTypes; +import com.google.gerrit.common.data.LabelType; +import com.google.gerrit.common.data.LabelTypes; import com.google.gerrit.common.data.LabelValue; import com.google.gerrit.common.data.Permission; import com.google.gerrit.common.data.PermissionRange; @@ -114,7 +114,7 @@ public class ChangeJson { } private final Provider db; - private final ApprovalTypes approvalTypes; + private final LabelTypes labelTypes; private final FunctionState.Factory functionState; private final CurrentUser user; private final AnonymousUser anonymous; @@ -134,7 +134,7 @@ public class ChangeJson { @Inject ChangeJson( Provider db, - ApprovalTypes at, + LabelTypes at, FunctionState.Factory fs, CurrentUser u, AnonymousUser au, @@ -146,7 +146,7 @@ public class ChangeJson { @CanonicalWebUrl Provider curl, Urls urls) { this.db = db; - this.approvalTypes = at; + this.labelTypes = at; this.functionState = fs; this.user = u; this.anonymous = au; @@ -338,7 +338,7 @@ public class ChangeJson { setAllApprovals(cd, labels); } for (Map.Entry e : labels.entrySet()) { - ApprovalType type = approvalTypes.byLabel(e.getKey()); + LabelType type = labelTypes.byLabel(e.getKey()); if (type == null) { continue; // TODO: Support arbitrary labels. } @@ -356,7 +356,7 @@ public class ChangeJson { throws OrmException { // Don't use Maps.newTreeMap(Comparator) due to OpenJDK bug 100167. Map labels = - new TreeMap(LabelOrdering.create(approvalTypes)); + new TreeMap(LabelOrdering.create(labelTypes)); for (SubmitRecord rec : submitRecords(cd)) { if (rec.labels == null) { continue; @@ -387,7 +387,7 @@ public class ChangeJson { return labels; } - private void setRecommendedAndDisliked(ChangeData cd, ApprovalType type, + private void setRecommendedAndDisliked(ChangeData cd, LabelType type, LabelInfo label) throws OrmException { if (label.approved != null || label.rejected != null) { return; @@ -428,25 +428,25 @@ public class ChangeJson { Collection approvals = cd.currentApprovals(db); FunctionState fs = functionState.create(ctl, cd.change(db).currentPatchSetId(), approvals); - for (ApprovalType at : approvalTypes.getApprovalTypes()) { - CategoryFunction.forType(at).run(at, fs); + for (LabelType lt : labelTypes.getLabelTypes()) { + CategoryFunction.forType(lt).run(lt, fs); } Multimap existing = HashMultimap.create(approvals.size(), labels.size()); for (PatchSetApproval psa : approvals) { - ApprovalType at = approvalTypes.byId(psa.getCategoryId().get()); - if (at == null) { + LabelType lt = labelTypes.byId(psa.getCategoryId().get()); + if (lt == null) { continue; } - LabelInfo p = labels.get(at.getName()); + LabelInfo p = labels.get(lt.getName()); if (p == null) { continue; // TODO: support arbitrary labels. } - if (!getRange(ctl, psa.getAccountId(), at.getName()).isEmpty()) { + if (!getRange(ctl, psa.getAccountId(), lt.getName()).isEmpty()) { p.addApproval(approvalInfo(psa.getAccountId(), psa.getValue())); } - existing.put(psa.getAccountId(), at.getName()); + existing.put(psa.getAccountId(), lt.getName()); } // Add dummy approvals for all permitted labels for each user even if they @@ -475,9 +475,9 @@ public class ChangeJson { // // Don't use Maps.newTreeMap(Comparator) due to OpenJDK bug 100167. Map labels = - new TreeMap(LabelOrdering.create(approvalTypes)); + new TreeMap(LabelOrdering.create(labelTypes)); for (PatchSetApproval psa : cd.currentApprovals(db)) { - ApprovalType type = approvalTypes.byId(psa.getCategoryId().get()); + LabelType type = labelTypes.byId(psa.getCategoryId().get()); if (type == null) { continue; } @@ -537,7 +537,7 @@ public class ChangeJson { return values.isEmpty() || (values.size() == 1 && values.contains(" 0")); } - private void setLabelValues(ApprovalType type, LabelInfo label) { + private void setLabelValues(LabelType type, LabelInfo label) { label.values = Maps.newLinkedHashMap(); for (LabelValue v : type.getValues()) { label.values.put(v.formatValue(), v.getText()); @@ -556,7 +556,7 @@ public class ChangeJson { continue; } for (SubmitRecord.Label r : rec.labels) { - ApprovalType type = approvalTypes.byLabel(r.label); + LabelType type = labelTypes.byLabel(r.label); if (type == null) { continue; // TODO: Support arbitrary labels. } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/LabelOrdering.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/LabelOrdering.java index 1455824aae..273960600a 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/LabelOrdering.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/LabelOrdering.java @@ -16,17 +16,17 @@ package com.google.gerrit.server.change; import com.google.common.base.Function; import com.google.common.collect.Ordering; -import com.google.gerrit.common.data.ApprovalType; -import com.google.gerrit.common.data.ApprovalTypes; +import com.google.gerrit.common.data.LabelType; +import com.google.gerrit.common.data.LabelTypes; class LabelOrdering { - public static Ordering create(final ApprovalTypes approvalTypes) { + public static Ordering create(final LabelTypes labelTypes) { return Ordering.natural().nullsLast().onResultOf( new Function() { @Override public Short apply(String n) { - ApprovalType at = approvalTypes.byLabel(n); - return at != null ? at.getPosition() : null; + LabelType lt = labelTypes.byLabel(n); + return lt != null ? lt.getPosition() : null; } }).compound(Ordering.natural()); } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/PostReview.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/PostReview.java index 74b7e9efed..bb38b9e382 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/PostReview.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/PostReview.java @@ -19,8 +19,8 @@ import com.google.common.base.Strings; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.gerrit.common.ChangeHooks; -import com.google.gerrit.common.data.ApprovalType; -import com.google.gerrit.common.data.ApprovalTypes; +import com.google.gerrit.common.data.LabelType; +import com.google.gerrit.common.data.LabelTypes; import com.google.gerrit.common.data.Permission; import com.google.gerrit.common.data.PermissionRange; import com.google.gerrit.extensions.restapi.AuthException; @@ -102,7 +102,7 @@ public class PostReview implements RestModifyView { } private final ReviewDb db; - private final ApprovalTypes approvalTypes; + private final LabelTypes labelTypes; private final EmailReviewComments.Factory email; @Deprecated private final ChangeHooks hooks; @@ -116,11 +116,11 @@ public class PostReview implements RestModifyView { @Inject PostReview(ReviewDb db, - ApprovalTypes approvalTypes, + LabelTypes labelTypes, EmailReviewComments.Factory email, ChangeHooks hooks) { this.db = db; - this.approvalTypes = approvalTypes; + this.labelTypes = labelTypes; this.email = email; this.hooks = hooks; } @@ -180,8 +180,8 @@ public class PostReview implements RestModifyView { Map.Entry ent = itr.next(); // TODO Support more generic label assignments. - ApprovalType at = approvalTypes.byLabel(ent.getKey()); - if (at == null) { + LabelType lt = labelTypes.byLabel(ent.getKey()); + if (lt == null) { if (strict) { throw new BadRequestException(String.format( "label \"%s\" is not a configured ApprovalCategory", @@ -198,7 +198,7 @@ public class PostReview implements RestModifyView { continue; } - if (at.getValue(ent.getValue()) == null) { + if (lt.getValue(ent.getValue()) == null) { if (strict) { throw new BadRequestException(String.format( "label \"%s\": %d is not a valid value", @@ -209,7 +209,7 @@ public class PostReview implements RestModifyView { } } - String name = at.getName(); + String name = lt.getName(); PermissionRange range = ctl.getRange(Permission.forLabel(name)); if (range == null || !range.contains(ent.getValue())) { if (strict) { @@ -345,8 +345,8 @@ public class PostReview implements RestModifyView { for (Map.Entry ent : labels.entrySet()) { // TODO Support arbitrary label names. - ApprovalType at = approvalTypes.byLabel(ent.getKey()); - String name = at.getName(); + LabelType lt = labelTypes.byLabel(ent.getKey()); + String name = lt.getName(); if (change.getStatus().isClosed()) { // TODO Allow updating some labels even when closed. continue; @@ -368,23 +368,23 @@ public class PostReview implements RestModifyView { upd.add(c); labelDelta.add(format(name, c.getValue())); categories.put( - at.getApprovalCategoryId(), - at.getApprovalCategoryValueId(c.getValue())); + lt.getApprovalCategoryId(), + lt.getApprovalCategoryValueId(c.getValue())); } else if (c != null && c.getValue() == ent.getValue()) { current.put(name, c); } else if (c == null) { c = new PatchSetApproval(new PatchSetApproval.Key( rsrc.getPatchSet().getId(), rsrc.getAccountId(), - at.getApprovalCategoryId()), + lt.getApprovalCategoryId()), ent.getValue()); c.setGranted(timestamp); c.cache(change); ins.add(c); labelDelta.add(format(name, c.getValue())); categories.put( - at.getApprovalCategoryId(), - at.getApprovalCategoryValueId(c.getValue())); + lt.getApprovalCategoryId(), + lt.getApprovalCategoryValueId(c.getValue())); } } @@ -402,11 +402,11 @@ public class PostReview implements RestModifyView { // TODO Find another way to link reviewers to changes. if (del.isEmpty()) { // If no existing label is being set to 0, hack in the caller - // as a reviewer by picking the first server-wide ApprovalType. + // as a reviewer by picking the first server-wide LabelType. PatchSetApproval c = new PatchSetApproval(new PatchSetApproval.Key( rsrc.getPatchSet().getId(), rsrc.getAccountId(), - approvalTypes.getApprovalTypes().get(0).getApprovalCategoryId()), + labelTypes.getLabelTypes().get(0).getApprovalCategoryId()), (short) 0); c.setGranted(timestamp); c.cache(change); @@ -433,9 +433,9 @@ public class PostReview implements RestModifyView { continue; } - ApprovalType at = approvalTypes.byId(a.getCategoryId().get()); - if (at != null) { - current.put(at.getName(), a); + LabelType lt = labelTypes.byId(a.getCategoryId().get()); + if (lt != null) { + current.put(lt.getName(), a); } else { del.add(a); } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/PostReviewers.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/PostReviewers.java index d02d11dd5c..6c8f732e17 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/PostReviewers.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/PostReviewers.java @@ -21,9 +21,9 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Sets; import com.google.gerrit.common.ChangeHooks; -import com.google.gerrit.common.data.ApprovalTypes; import com.google.gerrit.common.data.GroupDescription; import com.google.gerrit.common.data.GroupDescriptions; +import com.google.gerrit.common.data.LabelTypes; import com.google.gerrit.common.errors.EmailException; import com.google.gerrit.common.errors.NoSuchGroupException; import com.google.gerrit.extensions.restapi.AuthException; @@ -98,7 +98,7 @@ public class PostReviewers implements RestModifyView { Provider db, IdentifiedUser currentUser, IdentifiedUser.GenericFactory identifiedUserFactory, - ApprovalTypes approvalTypes, + LabelTypes labelTypes, @GerritServerConfig Config cfg, ChangeHooks hooks, AccountCache accountCache, @@ -117,7 +117,7 @@ public class PostReviewers implements RestModifyView { this.accountCache = accountCache; this.json = json; - this.addReviewerCategoryId = Iterables.getLast(approvalTypes.getApprovalTypes()) + this.addReviewerCategoryId = Iterables.getLast(labelTypes.getLabelTypes()) .getApprovalCategoryId(); } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/ReviewerJson.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/ReviewerJson.java index fc0089276e..76f8c0b7d2 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/ReviewerJson.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/ReviewerJson.java @@ -18,8 +18,8 @@ import static com.google.gerrit.common.data.LabelValue.formatValue; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; -import com.google.gerrit.common.data.ApprovalType; -import com.google.gerrit.common.data.ApprovalTypes; +import com.google.gerrit.common.data.LabelType; +import com.google.gerrit.common.data.LabelTypes; import com.google.gerrit.common.data.Permission; import com.google.gerrit.common.data.PermissionRange; import com.google.gerrit.common.data.SubmitRecord; @@ -42,17 +42,17 @@ import java.util.TreeMap; public class ReviewerJson { private final Provider db; - private final ApprovalTypes approvalTypes; + private final LabelTypes labelTypes; private final FunctionState.Factory functionState; private final AccountInfo.Loader.Factory accountLoaderFactory; @Inject ReviewerJson(Provider db, - ApprovalTypes approvalTypes, + LabelTypes labelTypes, FunctionState.Factory functionState, AccountInfo.Loader.Factory accountLoaderFactory) { this.db = db; - this.approvalTypes = approvalTypes; + this.labelTypes = labelTypes; this.functionState = functionState; this.accountLoaderFactory = accountLoaderFactory; } @@ -84,18 +84,18 @@ public class ReviewerJson { } FunctionState fs = functionState.create(ctl, psId, approvals); - for (ApprovalType at : approvalTypes.getApprovalTypes()) { + for (LabelType at : labelTypes.getLabelTypes()) { CategoryFunction.forType(at).run(at, fs); } // Don't use Maps.newTreeMap(Comparator) due to OpenJDK bug 100167. out.approvals = new TreeMap(LabelOrdering.create( - approvalTypes)); + labelTypes)); for (PatchSetApproval ca : approvals) { for (PermissionRange pr : ctl.getLabelRanges()) { if (!pr.isEmpty()) { // TODO: Support arbitrary labels. - ApprovalType at = approvalTypes.byId(ca.getCategoryId().get()); + LabelType at = labelTypes.byId(ca.getCategoryId().get()); if (at != null) { out.approvals.put(at.getName(), formatValue(ca.getValue())); } } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/GerritGlobalModule.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/GerritGlobalModule.java index 4abe96ad19..49fba6bdf3 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/config/GerritGlobalModule.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/GerritGlobalModule.java @@ -19,7 +19,7 @@ import static com.google.inject.Scopes.SINGLETON; import com.google.common.cache.Cache; import com.google.gerrit.audit.AuditModule; import com.google.gerrit.common.ChangeListener; -import com.google.gerrit.common.data.ApprovalTypes; +import com.google.gerrit.common.data.LabelTypes; import com.google.gerrit.extensions.events.GitReferenceUpdatedListener; import com.google.gerrit.extensions.events.NewProjectCreatedListener; import com.google.gerrit.extensions.registration.DynamicItem; @@ -140,7 +140,7 @@ public class GerritGlobalModule extends FactoryModule { break; } - bind(ApprovalTypes.class).toProvider(ApprovalTypesProvider.class).in( + bind(LabelTypes.class).toProvider(LabelTypesProvider.class).in( SINGLETON); bind(EmailExpander.class).toProvider(EmailExpanderProvider.class).in( SINGLETON); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/ApprovalTypesProvider.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/LabelTypesProvider.java similarity index 78% rename from gerrit-server/src/main/java/com/google/gerrit/server/config/ApprovalTypesProvider.java rename to gerrit-server/src/main/java/com/google/gerrit/server/config/LabelTypesProvider.java index b11e1bacd9..08ca057888 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/config/ApprovalTypesProvider.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/LabelTypesProvider.java @@ -14,8 +14,8 @@ package com.google.gerrit.server.config; -import com.google.gerrit.common.data.ApprovalType; -import com.google.gerrit.common.data.ApprovalTypes; +import com.google.gerrit.common.data.LabelType; +import com.google.gerrit.common.data.LabelTypes; import com.google.gerrit.reviewdb.client.ApprovalCategory; import com.google.gerrit.reviewdb.client.ApprovalCategoryValue; import com.google.gerrit.reviewdb.server.ReviewDb; @@ -29,17 +29,17 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -public class ApprovalTypesProvider implements Provider { +public class LabelTypesProvider implements Provider { private final SchemaFactory schema; @Inject - ApprovalTypesProvider(final SchemaFactory sf) { + LabelTypesProvider(final SchemaFactory sf) { schema = sf; } @Override - public ApprovalTypes get() { - List types = new ArrayList(2); + public LabelTypes get() { + List types = new ArrayList(2); try { final ReviewDb db = schema.open(); @@ -47,7 +47,7 @@ public class ApprovalTypesProvider implements Provider { for (final ApprovalCategory c : db.approvalCategories().all()) { final List values = db.approvalCategoryValues().byCategory(c.getId()).toList(); - types.add(ApprovalType.fromApprovalCategory(c, values)); + types.add(LabelType.fromApprovalCategory(c, values)); } } finally { db.close(); @@ -56,6 +56,6 @@ public class ApprovalTypesProvider implements Provider { throw new ProvisionException("Cannot query approval categories", e); } - return new ApprovalTypes(Collections.unmodifiableList(types)); + return new LabelTypes(Collections.unmodifiableList(types)); } } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/events/EventFactory.java b/gerrit-server/src/main/java/com/google/gerrit/server/events/EventFactory.java index e786430d22..7637e880aa 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/events/EventFactory.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/events/EventFactory.java @@ -14,8 +14,8 @@ package com.google.gerrit.server.events; -import com.google.gerrit.common.data.ApprovalType; -import com.google.gerrit.common.data.ApprovalTypes; +import com.google.gerrit.common.data.LabelType; +import com.google.gerrit.common.data.LabelTypes; import com.google.gerrit.common.data.SubmitRecord; import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.reviewdb.client.Branch; @@ -62,7 +62,7 @@ public class EventFactory { private static final Logger log = LoggerFactory.getLogger(EventFactory.class); private final AccountCache accountCache; private final Provider urlProvider; - private final ApprovalTypes approvalTypes; + private final LabelTypes labelTypes; private final PatchListCache patchListCache; private final SchemaFactory schema; private final PatchSetInfoFactory psInfoFactory; @@ -71,13 +71,13 @@ public class EventFactory { @Inject EventFactory(AccountCache accountCache, @CanonicalWebUrl @Nullable Provider urlProvider, - ApprovalTypes approvalTypes, + LabelTypes labelTypes, final PatchSetInfoFactory psif, PatchListCache patchListCache, SchemaFactory schema, @GerritPersonIdent PersonIdent myIdent) { this.accountCache = accountCache; this.urlProvider = urlProvider; - this.approvalTypes = approvalTypes; + this.labelTypes = labelTypes; this.patchListCache = patchListCache; this.schema = schema; this.psInfoFactory = psif; @@ -460,9 +460,9 @@ public class EventFactory { a.by = asAccountAttribute(approval.getAccountId()); a.grantedOn = approval.getGranted().getTime() / 1000L; - ApprovalType at = approvalTypes.byId(approval.getCategoryId().get()); - if (at != null) { - a.description = at.getName(); + LabelType lt = labelTypes.byId(approval.getCategoryId().get()); + if (lt != null) { + a.description = lt.getName(); } return a; } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/CherryPick.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/CherryPick.java index 8289ffe617..46e2b15b23 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/git/CherryPick.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/CherryPick.java @@ -24,7 +24,7 @@ import static com.google.gerrit.server.git.MergeUtil.mergeOneCommit; import static com.google.gerrit.server.git.MergeUtil.getApprovalsForCommit; import com.google.common.collect.Lists; -import com.google.gerrit.common.data.ApprovalTypes; +import com.google.gerrit.common.data.LabelTypes; import com.google.gerrit.reviewdb.client.Change; import com.google.gerrit.reviewdb.client.PatchSet; import com.google.gerrit.reviewdb.client.PatchSetAncestor; @@ -53,19 +53,19 @@ import java.util.Map; public class CherryPick extends SubmitStrategy { private final PatchSetInfoFactory patchSetInfoFactory; private final Provider urlProvider; - private final ApprovalTypes approvalTypes; + private final LabelTypes labelTypes; private final GitReferenceUpdated gitRefUpdated; private final Map newCommits; CherryPick(final SubmitStrategy.Arguments args, final PatchSetInfoFactory patchSetInfoFactory, - final Provider urlProvider, final ApprovalTypes approvalTypes, + final Provider urlProvider, final LabelTypes labelTypes, final GitReferenceUpdated gitRefUpdated) { super(args); this.patchSetInfoFactory = patchSetInfoFactory; this.urlProvider = urlProvider; - this.approvalTypes = approvalTypes; + this.labelTypes = labelTypes; this.gitRefUpdated = gitRefUpdated; this.newCommits = new HashMap(); } @@ -163,7 +163,7 @@ public class CherryPick extends SubmitStrategy { } final String cherryPickCmtMsg = - createCherryPickCommitMessage(n, approvalTypes, urlProvider, args.db, + createCherryPickCommitMessage(n, labelTypes, urlProvider, args.db, args.identifiedUserFactory); final CodeReviewCommit newCommit = diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java index 10963f4394..4a16399e70 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java @@ -26,8 +26,8 @@ import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Iterables; import com.google.common.collect.ListMultimap; import com.google.gerrit.common.ChangeHooks; -import com.google.gerrit.common.data.ApprovalType; -import com.google.gerrit.common.data.ApprovalTypes; +import com.google.gerrit.common.data.LabelType; +import com.google.gerrit.common.data.LabelTypes; import com.google.gerrit.common.data.Capable; import com.google.gerrit.common.data.SubmitTypeRecord; import com.google.gerrit.reviewdb.client.Account; @@ -130,7 +130,7 @@ public class MergeOp { private final GitReferenceUpdated gitRefUpdated; private final MergedSender.Factory mergedSenderFactory; private final MergeFailSender.Factory mergeFailSenderFactory; - private final ApprovalTypes approvalTypes; + private final LabelTypes labelTypes; private final PatchSetInfoFactory patchSetInfoFactory; private final IdentifiedUser.GenericFactory identifiedUserFactory; private final ChangeControl.GenericFactory changeControlFactory; @@ -164,7 +164,7 @@ public class MergeOp { final ProjectCache pc, final FunctionState.Factory fs, final GitReferenceUpdated gru, final MergedSender.Factory msf, final MergeFailSender.Factory mfsf, - final ApprovalTypes approvalTypes, final PatchSetInfoFactory psif, + final LabelTypes labelTypes, final PatchSetInfoFactory psif, final IdentifiedUser.GenericFactory iuf, final ChangeControl.GenericFactory changeControlFactory, final MergeQueue mergeQueue, @Assisted final Branch.NameKey branch, @@ -182,7 +182,7 @@ public class MergeOp { gitRefUpdated = gru; mergedSenderFactory = msf; mergeFailSenderFactory = mfsf; - this.approvalTypes = approvalTypes; + this.labelTypes = labelTypes; patchSetInfoFactory = psif; identifiedUserFactory = iuf; this.changeControlFactory = changeControlFactory; @@ -936,8 +936,8 @@ public class MergeOp { c, identifiedUserFactory.create(c.getOwner())), merged, approvals); - for (ApprovalType at : approvalTypes.getApprovalTypes()) { - CategoryFunction.forType(at).run(at, fs); + for (LabelType lt : labelTypes.getLabelTypes()) { + CategoryFunction.forType(lt).run(lt, fs); } for (PatchSetApproval a : approvals) { if (a.getValue() > 0 diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeUtil.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeUtil.java index a6e19e3bc3..e100559811 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeUtil.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeUtil.java @@ -14,8 +14,8 @@ package com.google.gerrit.server.git; -import com.google.gerrit.common.data.ApprovalType; -import com.google.gerrit.common.data.ApprovalTypes; +import com.google.gerrit.common.data.LabelType; +import com.google.gerrit.common.data.LabelTypes; import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.reviewdb.client.ApprovalCategory; import com.google.gerrit.reviewdb.client.Branch; @@ -165,7 +165,7 @@ public class MergeUtil { } public static String createCherryPickCommitMessage(final CodeReviewCommit n, - final ApprovalTypes approvalTypes, final Provider urlProvider, + final LabelTypes labelTypes, final Provider urlProvider, final ReviewDb db, final IdentifiedUser.GenericFactory identifiedUserFactory) { final List footers = n.getFooterLines(); final StringBuilder msgbuf = new StringBuilder(); @@ -254,12 +254,12 @@ public class MergeUtil { } else if (VRIF.equals(a.getCategoryId())) { tag = "Tested-by"; } else { - final ApprovalType at = approvalTypes.byId(a.getCategoryId().get()); - if (at == null) { + final LabelType lt = labelTypes.byId(a.getCategoryId().get()); + if (lt == null) { // TODO: Support arbitrary labels. continue; } - tag = at.getName(); + tag = lt.getName(); } if (!contains(footers, new FooterKey(tag), identbuf.toString())) { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/ReviewNoteHeaderFormatter.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/ReviewNoteHeaderFormatter.java index 49652b4ed9..71dbf87ba1 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/git/ReviewNoteHeaderFormatter.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/ReviewNoteHeaderFormatter.java @@ -14,7 +14,7 @@ package com.google.gerrit.server.git; -import com.google.gerrit.common.data.ApprovalType; +import com.google.gerrit.common.data.LabelType; import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.reviewdb.client.Branch; import com.google.gerrit.reviewdb.client.Change; @@ -51,7 +51,7 @@ class ReviewNoteHeaderFormatter { sb.append("Change-Id: ").append(changeKey.get()).append("\n"); } - void appendApproval(ApprovalType type, short value, Account user) { + void appendApproval(LabelType type, short value, Account user) { sb.append(type.getName()); sb.append(value < 0 ? "-" : "+").append(Math.abs(value)).append(": "); appendUserData(user); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/SubmitStrategyFactory.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/SubmitStrategyFactory.java index 27754af48c..093a7583d2 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/git/SubmitStrategyFactory.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/SubmitStrategyFactory.java @@ -14,7 +14,7 @@ package com.google.gerrit.server.git; -import com.google.gerrit.common.data.ApprovalTypes; +import com.google.gerrit.common.data.LabelTypes; import com.google.gerrit.reviewdb.client.Branch; import com.google.gerrit.reviewdb.client.Project.SubmitType; import com.google.gerrit.reviewdb.server.ReviewDb; @@ -49,7 +49,7 @@ public class SubmitStrategyFactory { private final PersonIdent myIdent; private final PatchSetInfoFactory patchSetInfoFactory; private final Provider urlProvider; - private final ApprovalTypes approvalTypes; + private final LabelTypes labelTypes; private final GitReferenceUpdated gitRefUpdated; private final RebaseChange rebaseChange; @@ -59,13 +59,13 @@ public class SubmitStrategyFactory { @GerritPersonIdent final PersonIdent myIdent, final PatchSetInfoFactory patchSetInfoFactory, @CanonicalWebUrl @Nullable final Provider urlProvider, - final ApprovalTypes approvalTypes, final GitReferenceUpdated gitRefUpdated, + final LabelTypes labelTypes, final GitReferenceUpdated gitRefUpdated, final RebaseChange rebaseChange) { this.identifiedUserFactory = identifiedUserFactory; this.myIdent = myIdent; this.patchSetInfoFactory = patchSetInfoFactory; this.urlProvider = urlProvider; - this.approvalTypes = approvalTypes; + this.labelTypes = labelTypes; this.gitRefUpdated = gitRefUpdated; this.rebaseChange = rebaseChange; } @@ -82,7 +82,7 @@ public class SubmitStrategyFactory { switch (submitType) { case CHERRY_PICK: return new CherryPick(args, patchSetInfoFactory, urlProvider, - approvalTypes, gitRefUpdated); + labelTypes, gitRefUpdated); case FAST_FORWARD_ONLY: return new FastForwardOnly(args); case MERGE_ALWAYS: diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/MergedSender.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/MergedSender.java index e75f117dbe..42f1dd33f2 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/mail/MergedSender.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/MergedSender.java @@ -16,8 +16,8 @@ package com.google.gerrit.server.mail; import com.google.common.collect.HashBasedTable; import com.google.common.collect.Table; -import com.google.gerrit.common.data.ApprovalType; -import com.google.gerrit.common.data.ApprovalTypes; +import com.google.gerrit.common.data.LabelType; +import com.google.gerrit.common.data.LabelTypes; import com.google.gerrit.common.data.LabelValue; import com.google.gerrit.common.errors.EmailException; import com.google.gerrit.reviewdb.client.Account; @@ -34,12 +34,12 @@ public class MergedSender extends ReplyToChangeSender { public MergedSender create(Change change); } - private final ApprovalTypes approvalTypes; + private final LabelTypes labelTypes; @Inject - public MergedSender(EmailArguments ea, ApprovalTypes at, @Assisted Change c) { + public MergedSender(EmailArguments ea, LabelTypes lt, @Assisted Change c) { super(ea, c, "merged"); - approvalTypes = at; + labelTypes = lt; } @Override @@ -63,7 +63,7 @@ public class MergedSender extends ReplyToChangeSender { Table neg = HashBasedTable.create(); for (PatchSetApproval ca : args.db.get().patchSetApprovals() .byPatchSet(patchSet.getId())) { - ApprovalType lt = approvalTypes.byId(ca.getCategoryId().get()); + LabelType lt = labelTypes.byId(ca.getCategoryId().get()); if (lt == null) { continue; } @@ -93,7 +93,7 @@ public class MergedSender extends ReplyToChangeSender { txt.append(getNameFor(id)); txt.append(": "); boolean first = true; - for (ApprovalType lt : approvalTypes.getApprovalTypes()) { + for (LabelType lt : labelTypes.getLabelTypes()) { PatchSetApproval ca = approvals.get(id, lt.getName()); if (ca == null) { continue; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeQueryBuilder.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeQueryBuilder.java index 1d34c24966..e80fa331e8 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeQueryBuilder.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeQueryBuilder.java @@ -15,7 +15,7 @@ package com.google.gerrit.server.query.change; import com.google.common.collect.Lists; -import com.google.gerrit.common.data.ApprovalTypes; +import com.google.gerrit.common.data.LabelTypes; import com.google.gerrit.common.data.GroupReference; import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.reviewdb.client.AccountGroup; @@ -110,7 +110,7 @@ public class ChangeQueryBuilder extends QueryBuilder { final ChangeControl.GenericFactory changeControlGenericFactory; final AccountResolver accountResolver; final GroupBackend groupBackend; - final ApprovalTypes approvalTypes; + final LabelTypes labelTypes; final AllProjectsName allProjectsName; final PatchListCache patchListCache; final GitRepositoryManager repoManager; @@ -124,7 +124,7 @@ public class ChangeQueryBuilder extends QueryBuilder { ChangeControl.GenericFactory changeControlGenericFactory, AccountResolver accountResolver, GroupBackend groupBackend, - ApprovalTypes approvalTypes, + LabelTypes labelTypes, AllProjectsName allProjectsName, PatchListCache patchListCache, GitRepositoryManager repoManager, @@ -136,7 +136,7 @@ public class ChangeQueryBuilder extends QueryBuilder { this.changeControlGenericFactory = changeControlGenericFactory; this.accountResolver = accountResolver; this.groupBackend = groupBackend; - this.approvalTypes = approvalTypes; + this.labelTypes = labelTypes; this.allProjectsName = allProjectsName; this.patchListCache = patchListCache; this.repoManager = repoManager; @@ -302,7 +302,7 @@ public class ChangeQueryBuilder extends QueryBuilder { @Operator public Predicate label(String name) { return new LabelPredicate(args.changeControlGenericFactory, - args.userFactory, args.dbProvider, args.approvalTypes, name); + args.userFactory, args.dbProvider, args.labelTypes, name); } @Operator diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/LabelPredicate.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/LabelPredicate.java index d13e7b893d..4fc48a5d6f 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/LabelPredicate.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/LabelPredicate.java @@ -14,8 +14,8 @@ package com.google.gerrit.server.query.change; -import com.google.gerrit.common.data.ApprovalType; -import com.google.gerrit.common.data.ApprovalTypes; +import com.google.gerrit.common.data.LabelType; +import com.google.gerrit.common.data.LabelTypes; import com.google.gerrit.common.data.Permission; import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.reviewdb.client.Change; @@ -57,7 +57,7 @@ class LabelPredicate extends OperatorPredicate { abstract boolean match(int psValue, int expValue); } - private static ApprovalType type(ApprovalTypes types, String toFind) { + private static LabelType type(LabelTypes types, String toFind) { if (types.byLabel(toFind) != null) { return types.byLabel(toFind); } @@ -66,19 +66,19 @@ class LabelPredicate extends OperatorPredicate { return types.byId(toFind); } - for (ApprovalType at : types.getApprovalTypes()) { - if (toFind.equalsIgnoreCase(at.getName())) { - return at; + for (LabelType lt : types.getLabelTypes()) { + if (toFind.equalsIgnoreCase(lt.getName())) { + return lt; } } - for (ApprovalType at : types.getApprovalTypes()) { - if (toFind.equalsIgnoreCase(at.getAbbreviatedName())) { - return at; + for (LabelType lt : types.getLabelTypes()) { + if (toFind.equalsIgnoreCase(lt.getAbbreviatedName())) { + return lt; } } - return ApprovalType.withDefaultValues(toFind.substring(0, 4), toFind); + return LabelType.withDefaultValues(toFind.substring(0, 4), toFind); } private static Test op(String op) { @@ -107,13 +107,13 @@ class LabelPredicate extends OperatorPredicate { private final IdentifiedUser.GenericFactory userFactory; private final Provider dbProvider; private final Test test; - private final ApprovalType type; + private final LabelType type; private final String permissionName; private final int expVal; LabelPredicate(ChangeControl.GenericFactory ccFactory, IdentifiedUser.GenericFactory userFactory, Provider dbProvider, - ApprovalTypes types, String value) { + LabelTypes types, String value) { super(ChangeQueryBuilder.FIELD_LABEL, value); this.ccFactory = ccFactory; this.userFactory = userFactory; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/workflow/CategoryFunction.java b/gerrit-server/src/main/java/com/google/gerrit/server/workflow/CategoryFunction.java index 07591bcf5e..922915cb31 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/workflow/CategoryFunction.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/workflow/CategoryFunction.java @@ -14,7 +14,7 @@ package com.google.gerrit.server.workflow; -import com.google.gerrit.common.data.ApprovalType; +import com.google.gerrit.common.data.LabelType; import com.google.gerrit.reviewdb.client.ApprovalCategory; import com.google.gerrit.reviewdb.client.PatchSetApproval; @@ -43,7 +43,7 @@ public abstract class CategoryFunction { * @return the function implementation; {@link NoOpFunction} if the function * is not known to Gerrit and thus cannot be executed. */ - public static CategoryFunction forType(ApprovalType type) { + public static CategoryFunction forType(LabelType type) { CategoryFunction r = all.get(type.getFunctionName()); return r != null ? r : new NoOpFunction(); } @@ -85,9 +85,9 @@ public abstract class CategoryFunction { * state.valid(at, !neg && pos); * * - * @param at the cached category description to process. + * @param lt the cached category description to process. * @param state state to read approvals and project rights from, and to update * the valid status into. */ - public abstract void run(ApprovalType at, FunctionState state); + public abstract void run(LabelType lt, FunctionState state); } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/workflow/FunctionState.java b/gerrit-server/src/main/java/com/google/gerrit/server/workflow/FunctionState.java index 0b1d711f43..a7a542230f 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/workflow/FunctionState.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/workflow/FunctionState.java @@ -14,8 +14,8 @@ package com.google.gerrit.server.workflow; -import com.google.gerrit.common.data.ApprovalType; -import com.google.gerrit.common.data.ApprovalTypes; +import com.google.gerrit.common.data.LabelType; +import com.google.gerrit.common.data.LabelTypes; import com.google.gerrit.common.data.LabelValue; import com.google.gerrit.common.data.Permission; import com.google.gerrit.common.data.PermissionRange; @@ -42,7 +42,7 @@ public class FunctionState { Collection all); } - private final ApprovalTypes approvalTypes; + private final LabelTypes labelTypes; private final IdentifiedUser.GenericFactory userFactory; private final Map> approvals = @@ -52,11 +52,11 @@ public class FunctionState { private final Change change; @Inject - FunctionState(final ApprovalTypes approvalTypes, + FunctionState(final LabelTypes labelTypes, final IdentifiedUser.GenericFactory userFactory, @Assisted final ChangeControl c, @Assisted final PatchSet.Id psId, @Assisted final Collection all) { - this.approvalTypes = approvalTypes; + this.labelTypes = labelTypes; this.userFactory = userFactory; callerChangeControl = c; @@ -68,10 +68,10 @@ public class FunctionState { approvals.get(ca.getCategoryId().get()); if (l == null) { l = new ArrayList(); - ApprovalType at = approvalTypes.byId(ca.getCategoryId().get()); - if (at != null) { + LabelType lt = labelTypes.byId(ca.getCategoryId().get()); + if (lt != null) { // TODO: Support arbitrary labels - approvals.put(at.getName(), l); + approvals.put(lt.getName(), l); } } l.add(ca); @@ -79,20 +79,20 @@ public class FunctionState { } } - List getApprovalTypes() { - return approvalTypes.getApprovalTypes(); + List getLabelTypes() { + return labelTypes.getLabelTypes(); } Change getChange() { return change; } - public void valid(final ApprovalType at, final boolean v) { - valid.put(id(at), v); + public void valid(final LabelType lt, final boolean v) { + valid.put(id(lt), v); } - public boolean isValid(final ApprovalType at) { - return isValid(at.getName()); + public boolean isValid(final LabelType lt) { + return isValid(lt.getName()); } public boolean isValid(final String labelName) { @@ -100,8 +100,8 @@ public class FunctionState { return b != null && b; } - public Collection getApprovals(final ApprovalType at) { - return getApprovals(at.getName()); + public Collection getApprovals(final LabelType lt) { + return getApprovals(lt.getName()); } public Collection getApprovals(final String labelName) { @@ -114,14 +114,14 @@ public class FunctionState { * case the type was modified since the approval was originally granted. *

*/ - private void applyTypeFloor(final ApprovalType at, final PatchSetApproval a) { - final LabelValue atMin = at.getMin(); + private void applyTypeFloor(final LabelType lt, final PatchSetApproval a) { + final LabelValue atMin = lt.getMin(); if (atMin != null && a.getValue() < atMin.getValue()) { a.setValue(atMin.getValue()); } - final LabelValue atMax = at.getMax(); + final LabelValue atMax = lt.getMax(); if (atMax != null && a.getValue() > atMax.getValue()) { a.setValue(atMax.getValue()); } @@ -136,8 +136,8 @@ public class FunctionState { * of them is used. *

*/ - private void applyRightFloor(final ApprovalType at, final PatchSetApproval a) { - final String permission = Permission.forLabel(at.getName()); + private void applyRightFloor(final LabelType lt, final PatchSetApproval a) { + final String permission = Permission.forLabel(lt.getName()); final IdentifiedUser user = userFactory.create(a.getAccountId()); final PermissionRange range = controlFor(user).getRange(permission); a.setValue((short) range.squash(a.getValue())); @@ -148,12 +148,12 @@ public class FunctionState { } /** Run applyTypeFloor, applyRightFloor. */ - public void normalize(final ApprovalType at, final PatchSetApproval ca) { - applyTypeFloor(at, ca); - applyRightFloor(at, ca); + public void normalize(final LabelType lt, final PatchSetApproval ca) { + applyTypeFloor(lt, ca); + applyRightFloor(lt, ca); } - private static String id(final ApprovalType at) { - return at.getId(); + private static String id(final LabelType lt) { + return lt.getId(); } } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/workflow/MaxNoBlock.java b/gerrit-server/src/main/java/com/google/gerrit/server/workflow/MaxNoBlock.java index 3272f8a687..e451d024f3 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/workflow/MaxNoBlock.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/workflow/MaxNoBlock.java @@ -14,7 +14,7 @@ package com.google.gerrit.server.workflow; -import com.google.gerrit.common.data.ApprovalType; +import com.google.gerrit.common.data.LabelType; import com.google.gerrit.reviewdb.client.ApprovalCategory; import com.google.gerrit.reviewdb.client.PatchSetApproval; @@ -33,16 +33,16 @@ public class MaxNoBlock extends CategoryFunction { public static String NAME = "MaxNoBlock"; @Override - public void run(final ApprovalType at, final FunctionState state) { + public void run(final LabelType lt, final FunctionState state) { boolean passed = false; - for (final PatchSetApproval a : state.getApprovals(at)) { - state.normalize(at, a); + for (final PatchSetApproval a : state.getApprovals(lt)) { + state.normalize(lt, a); - passed |= at.isMaxPositive(a); + passed |= lt.isMaxPositive(a); } // The type must have at least one max positive (a full accept). // - state.valid(at, passed); + state.valid(lt, passed); } } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/workflow/MaxWithBlock.java b/gerrit-server/src/main/java/com/google/gerrit/server/workflow/MaxWithBlock.java index ce84499554..5a3aa1055f 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/workflow/MaxWithBlock.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/workflow/MaxWithBlock.java @@ -14,7 +14,7 @@ package com.google.gerrit.server.workflow; -import com.google.gerrit.common.data.ApprovalType; +import com.google.gerrit.common.data.LabelType; import com.google.gerrit.reviewdb.client.ApprovalCategory; import com.google.gerrit.reviewdb.client.PatchSetApproval; @@ -45,19 +45,19 @@ public class MaxWithBlock extends CategoryFunction { public static String NAME = "MaxWithBlock"; @Override - public void run(final ApprovalType at, final FunctionState state) { + public void run(final LabelType lt, final FunctionState state) { boolean rejected = false; boolean passed = false; - for (final PatchSetApproval a : state.getApprovals(at)) { - state.normalize(at, a); + for (final PatchSetApproval a : state.getApprovals(lt)) { + state.normalize(lt, a); - rejected |= at.isMaxNegative(a); - passed |= at.isMaxPositive(a); + rejected |= lt.isMaxNegative(a); + passed |= lt.isMaxPositive(a); } // The type must not have had its max negative (a forceful reject) // and must have at least one max positive (a full accept). // - state.valid(at, !rejected && passed); + state.valid(lt, !rejected && passed); } } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/workflow/NoBlock.java b/gerrit-server/src/main/java/com/google/gerrit/server/workflow/NoBlock.java index 08d0705dea..e5ced89c7b 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/workflow/NoBlock.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/workflow/NoBlock.java @@ -14,14 +14,14 @@ package com.google.gerrit.server.workflow; -import com.google.gerrit.common.data.ApprovalType; +import com.google.gerrit.common.data.LabelType; /** A function that does nothing. */ public class NoBlock extends CategoryFunction { public static String NAME = "NoBlock"; @Override - public void run(final ApprovalType at, final FunctionState state) { - state.valid(at, true); + public void run(final LabelType lt, final FunctionState state) { + state.valid(lt, true); } } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/workflow/NoOpFunction.java b/gerrit-server/src/main/java/com/google/gerrit/server/workflow/NoOpFunction.java index 8c76cc52fa..1b96109dfe 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/workflow/NoOpFunction.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/workflow/NoOpFunction.java @@ -14,13 +14,13 @@ package com.google.gerrit.server.workflow; -import com.google.gerrit.common.data.ApprovalType; +import com.google.gerrit.common.data.LabelType; /** A function that does nothing. */ public class NoOpFunction extends CategoryFunction { public static String NAME = "NoOp"; @Override - public void run(final ApprovalType at, final FunctionState state) { + public void run(final LabelType lt, final FunctionState state) { } } diff --git a/gerrit-server/src/main/java/gerrit/PRED__load_commit_labels_1.java b/gerrit-server/src/main/java/gerrit/PRED__load_commit_labels_1.java index 8c5aedde33..2fad64b260 100644 --- a/gerrit-server/src/main/java/gerrit/PRED__load_commit_labels_1.java +++ b/gerrit-server/src/main/java/gerrit/PRED__load_commit_labels_1.java @@ -2,8 +2,8 @@ package gerrit; -import com.google.gerrit.common.data.ApprovalType; -import com.google.gerrit.common.data.ApprovalTypes; +import com.google.gerrit.common.data.LabelType; +import com.google.gerrit.common.data.LabelTypes; import com.google.gerrit.reviewdb.client.PatchSet; import com.google.gerrit.reviewdb.client.PatchSetApproval; import com.google.gerrit.reviewdb.server.ReviewDb; @@ -46,7 +46,7 @@ class PRED__load_commit_labels_1 extends Predicate.P1 { ReviewDb db = StoredValues.REVIEW_DB.get(engine); PatchSet patchSet = StoredValues.PATCH_SET.get(engine); ChangeData cd = StoredValues.CHANGE_DATA.getOrNull(engine); - ApprovalTypes types = env.getInjector().getInstance(ApprovalTypes.class); + LabelTypes types = env.getInjector().getInstance(LabelTypes.class); Iterable approvals; if (cd != null) { @@ -60,7 +60,7 @@ class PRED__load_commit_labels_1 extends Predicate.P1 { continue; } - ApprovalType t = types.byId(a.getCategoryId().get()); + LabelType t = types.byId(a.getCategoryId().get()); if (t == null) { continue; } diff --git a/gerrit-server/src/main/java/gerrit/PRED_get_legacy_approval_types_1.java b/gerrit-server/src/main/java/gerrit/PRED_get_legacy_approval_types_1.java index 7da6f1b09d..232caad206 100644 --- a/gerrit-server/src/main/java/gerrit/PRED_get_legacy_approval_types_1.java +++ b/gerrit-server/src/main/java/gerrit/PRED_get_legacy_approval_types_1.java @@ -14,8 +14,8 @@ package gerrit; -import com.google.gerrit.common.data.ApprovalType; -import com.google.gerrit.common.data.ApprovalTypes; +import com.google.gerrit.common.data.LabelType; +import com.google.gerrit.common.data.LabelTypes; import com.google.gerrit.rules.PrologEnvironment; import com.googlecode.prolog_cafe.lang.IntegerTerm; @@ -54,9 +54,9 @@ class PRED_get_legacy_approval_types_1 extends Predicate.P1 { Term a1 = arg1.dereference(); PrologEnvironment env = (PrologEnvironment) engine.control; - ApprovalTypes types = env.getInjector().getInstance(ApprovalTypes.class); + LabelTypes types = env.getInjector().getInstance(LabelTypes.class); - List list = types.getApprovalTypes(); + List list = types.getLabelTypes(); Term head = Prolog.Nil; for (int idx = list.size() - 1; 0 <= idx; idx--) { head = new ListTerm(export(list.get(idx)), head); @@ -71,7 +71,7 @@ class PRED_get_legacy_approval_types_1 extends Predicate.P1 { static final SymbolTerm symApprovalType = SymbolTerm.intern( "approval_type", 5); - static Term export(ApprovalType type) { + static Term export(LabelType type) { return new StructureTerm(symApprovalType, SymbolTerm.intern(type.getName()), SymbolTerm.intern(type.getId()), diff --git a/gerrit-server/src/test/java/com/google/gerrit/rules/GerritCommonTest.java b/gerrit-server/src/test/java/com/google/gerrit/rules/GerritCommonTest.java index 3de1531e09..5a1926cc5f 100644 --- a/gerrit-server/src/test/java/com/google/gerrit/rules/GerritCommonTest.java +++ b/gerrit-server/src/test/java/com/google/gerrit/rules/GerritCommonTest.java @@ -14,8 +14,8 @@ package com.google.gerrit.rules; -import com.google.gerrit.common.data.ApprovalType; -import com.google.gerrit.common.data.ApprovalTypes; +import com.google.gerrit.common.data.LabelType; +import com.google.gerrit.common.data.LabelTypes; import com.google.gerrit.common.data.LabelValue; import com.google.inject.AbstractModule; @@ -26,7 +26,7 @@ public class GerritCommonTest extends PrologTestCase { public void setUp() throws Exception { super.setUp(); - final ApprovalTypes types = new ApprovalTypes(Arrays.asList( + final LabelTypes types = new LabelTypes(Arrays.asList( category(0, "CRVW", "Code-Review", value(2, "Looks good to me, approved"), value(1, "Looks good to me, but someone else must approve"), @@ -42,7 +42,7 @@ public class GerritCommonTest extends PrologTestCase { load("gerrit", "gerrit_common_test.pl", new AbstractModule() { @Override protected void configure() { - bind(ApprovalTypes.class).toInstance(types); + bind(LabelTypes.class).toInstance(types); } }); } @@ -51,9 +51,9 @@ public class GerritCommonTest extends PrologTestCase { return new LabelValue((short) value, text); } - private static ApprovalType category(int pos, String id, String name, + private static LabelType category(int pos, String id, String name, LabelValue... values) { - ApprovalType type = new ApprovalType(id, name, Arrays.asList(values)); + LabelType type = new LabelType(id, name, Arrays.asList(values)); type.setPosition((short) pos); return type; } diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ApproveOption.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ApproveOption.java index ee7bcd208f..29250d3449 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ApproveOption.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ApproveOption.java @@ -14,7 +14,7 @@ package com.google.gerrit.sshd.commands; -import com.google.gerrit.common.data.ApprovalType; +import com.google.gerrit.common.data.LabelType; import com.google.gerrit.common.data.LabelValue; import org.kohsuke.args4j.CmdLineException; @@ -30,11 +30,11 @@ import java.lang.annotation.Annotation; final class ApproveOption implements Option, Setter { private final String name; private final String usage; - private final ApprovalType type; + private final LabelType type; private Short value; - ApproveOption(final String name, final String usage, final ApprovalType type) { + ApproveOption(final String name, final String usage, final LabelType type) { this.name = name; this.usage = usage; this.type = type; diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ReviewCommand.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ReviewCommand.java index 3412507b29..321f04b5bb 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ReviewCommand.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ReviewCommand.java @@ -16,8 +16,8 @@ package com.google.gerrit.sshd.commands; import com.google.common.base.Strings; import com.google.common.collect.Maps; -import com.google.gerrit.common.data.ApprovalType; -import com.google.gerrit.common.data.ApprovalTypes; +import com.google.gerrit.common.data.LabelType; +import com.google.gerrit.common.data.LabelTypes; import com.google.gerrit.common.data.LabelValue; import com.google.gerrit.common.data.ReviewResult; import com.google.gerrit.common.data.ReviewResult.Error.Type; @@ -116,7 +116,7 @@ public class ReviewCommand extends SshCommand { private ReviewDb db; @Inject - private ApprovalTypes approvalTypes; + private LabelTypes labelTypes; @Inject private DeleteDraftPatchSet.Factory deleteDraftPatchSetFactory; @@ -400,7 +400,7 @@ public class ReviewCommand extends SshCommand { protected void parseCommandLine() throws UnloggedFailure { optionList = new ArrayList(); - for (ApprovalType type : approvalTypes.getApprovalTypes()) { + for (LabelType type : labelTypes.getLabelTypes()) { String usage = ""; usage = "score for " + type.getName() + "\n";