diff --git a/java/com/google/gerrit/acceptance/AbstractDaemonTest.java b/java/com/google/gerrit/acceptance/AbstractDaemonTest.java index 0cd04021df..dcb1c1cfb9 100644 --- a/java/com/google/gerrit/acceptance/AbstractDaemonTest.java +++ b/java/com/google/gerrit/acceptance/AbstractDaemonTest.java @@ -49,12 +49,7 @@ import com.google.gerrit.acceptance.testsuite.account.TestSshKeys; import com.google.gerrit.acceptance.testsuite.project.ProjectOperations; import com.google.gerrit.acceptance.testsuite.request.RequestScopeOperations; import com.google.gerrit.common.Nullable; -import com.google.gerrit.common.data.AccessSection; -import com.google.gerrit.common.data.LabelFunction; -import com.google.gerrit.common.data.LabelType; -import com.google.gerrit.common.data.Permission; -import com.google.gerrit.common.data.PermissionRule; -import com.google.gerrit.common.data.PermissionRule.Action; +import com.google.gerrit.entities.AccessSection; import com.google.gerrit.entities.Account; import com.google.gerrit.entities.AccountGroup; import com.google.gerrit.entities.Address; @@ -64,8 +59,13 @@ import com.google.gerrit.entities.Change; import com.google.gerrit.entities.EmailHeader; import com.google.gerrit.entities.GroupDescription; import com.google.gerrit.entities.GroupReference; +import com.google.gerrit.entities.LabelFunction; +import com.google.gerrit.entities.LabelType; import com.google.gerrit.entities.LabelValue; import com.google.gerrit.entities.PatchSet; +import com.google.gerrit.entities.Permission; +import com.google.gerrit.entities.PermissionRule; +import com.google.gerrit.entities.PermissionRule.Action; import com.google.gerrit.entities.Project; import com.google.gerrit.entities.RefNames; import com.google.gerrit.extensions.api.GerritApi; diff --git a/java/com/google/gerrit/acceptance/testsuite/project/ProjectOperationsImpl.java b/java/com/google/gerrit/acceptance/testsuite/project/ProjectOperationsImpl.java index 60b37206f1..c894059a07 100644 --- a/java/com/google/gerrit/acceptance/testsuite/project/ProjectOperationsImpl.java +++ b/java/com/google/gerrit/acceptance/testsuite/project/ProjectOperationsImpl.java @@ -26,11 +26,11 @@ import com.google.gerrit.acceptance.testsuite.project.TestProjectCreation.Builde import com.google.gerrit.acceptance.testsuite.project.TestProjectUpdate.TestCapability; import com.google.gerrit.acceptance.testsuite.project.TestProjectUpdate.TestLabelPermission; import com.google.gerrit.acceptance.testsuite.project.TestProjectUpdate.TestPermission; -import com.google.gerrit.common.data.AccessSection; -import com.google.gerrit.common.data.Permission; -import com.google.gerrit.common.data.PermissionRule; +import com.google.gerrit.entities.AccessSection; import com.google.gerrit.entities.AccountGroup; import com.google.gerrit.entities.GroupReference; +import com.google.gerrit.entities.Permission; +import com.google.gerrit.entities.PermissionRule; import com.google.gerrit.entities.Project; import com.google.gerrit.entities.RefNames; import com.google.gerrit.server.config.AllProjectsName; diff --git a/java/com/google/gerrit/acceptance/testsuite/project/TestProjectUpdate.java b/java/com/google/gerrit/acceptance/testsuite/project/TestProjectUpdate.java index 734854b041..ea2093181b 100644 --- a/java/com/google/gerrit/acceptance/testsuite/project/TestProjectUpdate.java +++ b/java/com/google/gerrit/acceptance/testsuite/project/TestProjectUpdate.java @@ -15,7 +15,7 @@ package com.google.gerrit.acceptance.testsuite.project; import static com.google.common.base.Preconditions.checkArgument; -import static com.google.gerrit.common.data.AccessSection.GLOBAL_CAPABILITIES; +import static com.google.gerrit.entities.AccessSection.GLOBAL_CAPABILITIES; import static java.util.Objects.requireNonNull; import com.google.auto.value.AutoValue; @@ -23,11 +23,11 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.gerrit.acceptance.testsuite.ThrowingConsumer; import com.google.gerrit.common.data.GlobalCapability; -import com.google.gerrit.common.data.LabelType; -import com.google.gerrit.common.data.Permission; -import com.google.gerrit.common.data.PermissionRange; -import com.google.gerrit.common.data.PermissionRule; import com.google.gerrit.entities.AccountGroup; +import com.google.gerrit.entities.LabelType; +import com.google.gerrit.entities.Permission; +import com.google.gerrit.entities.PermissionRange; +import com.google.gerrit.entities.PermissionRule; import com.google.gerrit.entities.Project; import com.google.gerrit.server.config.AllProjectsName; import java.util.Optional; diff --git a/java/com/google/gerrit/common/data/GlobalCapability.java b/java/com/google/gerrit/common/data/GlobalCapability.java index 10a66cc795..51d9ecda3f 100644 --- a/java/com/google/gerrit/common/data/GlobalCapability.java +++ b/java/com/google/gerrit/common/data/GlobalCapability.java @@ -14,6 +14,8 @@ package com.google.gerrit.common.data; +import com.google.gerrit.entities.Permission; +import com.google.gerrit.entities.PermissionRange; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; diff --git a/java/com/google/gerrit/common/data/AccessSection.java b/java/com/google/gerrit/entities/AccessSection.java similarity index 98% rename from java/com/google/gerrit/common/data/AccessSection.java rename to java/com/google/gerrit/entities/AccessSection.java index 0974c47cf6..d97bca884a 100644 --- a/java/com/google/gerrit/common/data/AccessSection.java +++ b/java/com/google/gerrit/entities/AccessSection.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.common.data; +package com.google.gerrit.entities; import static com.google.common.collect.ImmutableList.toImmutableList; import static java.util.Objects.requireNonNull; @@ -20,7 +20,6 @@ import static java.util.Objects.requireNonNull; import com.google.auto.value.AutoValue; import com.google.common.collect.ImmutableList; import com.google.gerrit.common.Nullable; -import com.google.gerrit.entities.Project; import java.util.ArrayList; import java.util.List; import java.util.Optional; diff --git a/java/com/google/gerrit/server/project/AccountsSection.java b/java/com/google/gerrit/entities/AccountsSection.java similarity index 91% rename from java/com/google/gerrit/server/project/AccountsSection.java rename to java/com/google/gerrit/entities/AccountsSection.java index 04f63f7a32..93083a20df 100644 --- a/java/com/google/gerrit/server/project/AccountsSection.java +++ b/java/com/google/gerrit/entities/AccountsSection.java @@ -12,11 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.project; +package com.google.gerrit.entities; import com.google.auto.value.AutoValue; import com.google.common.collect.ImmutableList; -import com.google.gerrit.common.data.PermissionRule; import java.util.List; @AutoValue diff --git a/java/com/google/gerrit/server/project/CachedProjectConfig.java b/java/com/google/gerrit/entities/CachedProjectConfig.java similarity index 66% rename from java/com/google/gerrit/server/project/CachedProjectConfig.java rename to java/com/google/gerrit/entities/CachedProjectConfig.java index 8af2f80592..79d7de7e82 100644 --- a/java/com/google/gerrit/server/project/CachedProjectConfig.java +++ b/java/com/google/gerrit/entities/CachedProjectConfig.java @@ -12,24 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.project; +package com.google.gerrit.entities; import com.google.auto.value.AutoValue; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -import com.google.gerrit.common.data.AccessSection; -import com.google.gerrit.common.data.ContributorAgreement; -import com.google.gerrit.common.data.LabelType; -import com.google.gerrit.common.data.SubscribeSection; -import com.google.gerrit.entities.AccountGroup; -import com.google.gerrit.entities.BranchNameKey; -import com.google.gerrit.entities.BranchOrderSection; -import com.google.gerrit.entities.ConfiguredMimeTypes; -import com.google.gerrit.entities.GroupReference; -import com.google.gerrit.entities.NotifyConfig; -import com.google.gerrit.entities.Project; -import com.google.gerrit.entities.StoredCommentLinkInfo; import java.util.Collection; import java.util.List; import java.util.Map; @@ -37,7 +25,8 @@ import java.util.Optional; import org.eclipse.jgit.lib.ObjectId; /** - * Cached representation of values parsed from {@link ProjectConfig}. + * Cached representation of values parsed from {@link + * com.google.gerrit.server.project.ProjectConfig}. * *

This class is immutable and thread-safe. */ @@ -53,8 +42,8 @@ public abstract class CachedProjectConfig { } /** - * Returns the group reference for a {@link com.google.gerrit.entities.AccountGroup.UUID}, if the - * group is used by at least one rule. + * Returns the group reference for a {@link AccountGroup.UUID}, if the group is used by at least + * one rule. */ public Optional getGroup(AccountGroup.UUID uuid) { return Optional.ofNullable(getGroups().get(uuid)); @@ -93,10 +82,7 @@ public abstract class CachedProjectConfig { /** Returns configured {@link ConfiguredMimeTypes}s. */ public abstract ConfiguredMimeTypes getMimeTypes(); - /** - * Returns {@link SubscribeSection} keyed by the {@link - * com.google.gerrit.entities.Project.NameKey} they reference. - */ + /** Returns {@link SubscribeSection} keyed by the {@link Project.NameKey} they reference. */ public abstract ImmutableMap getSubscribeSections(); /** Returns {@link StoredCommentLinkInfo} keyed by their name. */ @@ -126,32 +112,52 @@ public abstract class CachedProjectConfig { return new AutoValue_CachedProjectConfig.Builder(); } + public abstract Builder toBuilder(); + @AutoValue.Builder public abstract static class Builder { public abstract Builder setProject(Project value); - public abstract Builder setGroups(ImmutableMap value); - public abstract Builder setAccountsSection(AccountsSection value); - public abstract Builder setAccessSections(ImmutableMap value); - public abstract Builder setBranchOrderSection(Optional value); - public abstract Builder setContributorAgreements( - ImmutableMap value); + public Builder addGroup(GroupReference groupReference) { + groupsBuilder().put(groupReference.getUUID(), groupReference); + return this; + } - public abstract Builder setNotifySections(ImmutableMap value); + public Builder addAccessSection(AccessSection accessSection) { + accessSectionsBuilder().put(accessSection.getName(), accessSection); + return this; + } - public abstract Builder setLabelSections(ImmutableMap value); + public Builder addContributorAgreement(ContributorAgreement contributorAgreement) { + contributorAgreementsBuilder().put(contributorAgreement.getName(), contributorAgreement); + return this; + } + + public Builder addNotifySection(NotifyConfig notifyConfig) { + notifySectionsBuilder().put(notifyConfig.getName(), notifyConfig); + return this; + } + + public Builder addLabelSection(LabelType labelType) { + labelSectionsBuilder().put(labelType.getName(), labelType); + return this; + } public abstract Builder setMimeTypes(ConfiguredMimeTypes value); - public abstract Builder setSubscribeSections( - ImmutableMap value); + public Builder addSubscribeSection(SubscribeSection subscribeSection) { + subscribeSectionsBuilder().put(subscribeSection.project(), subscribeSection); + return this; + } - public abstract Builder setCommentLinkSections( - ImmutableMap value); + public Builder addCommentLinkSection(StoredCommentLinkInfo storedCommentLinkInfo) { + commentLinkSectionsBuilder().put(storedCommentLinkInfo.getName(), storedCommentLinkInfo); + return this; + } public abstract Builder setRulesId(Optional value); @@ -161,16 +167,37 @@ public abstract class CachedProjectConfig { public abstract Builder setCheckReceivedObjects(boolean value); - public abstract Builder setExtensionPanelSections( - ImmutableMap> value); + public abstract ImmutableMap.Builder> + extensionPanelSectionsBuilder(); public Builder setExtensionPanelSections(Map> value) { - ImmutableMap.Builder> b = ImmutableMap.builder(); - value.entrySet().forEach(e -> b.put(e.getKey(), ImmutableList.copyOf(e.getValue()))); - return setExtensionPanelSections(b.build()); + value + .entrySet() + .forEach( + e -> + extensionPanelSectionsBuilder() + .put(e.getKey(), ImmutableList.copyOf(e.getValue()))); + return this; } public abstract CachedProjectConfig build(); + + protected abstract ImmutableMap.Builder groupsBuilder(); + + protected abstract ImmutableMap.Builder accessSectionsBuilder(); + + protected abstract ImmutableMap.Builder + contributorAgreementsBuilder(); + + protected abstract ImmutableMap.Builder notifySectionsBuilder(); + + protected abstract ImmutableMap.Builder labelSectionsBuilder(); + + protected abstract ImmutableMap.Builder + subscribeSectionsBuilder(); + + protected abstract ImmutableMap.Builder + commentLinkSectionsBuilder(); } private static ImmutableList filterSubscribeSectionsByBranch( diff --git a/java/com/google/gerrit/entities/ConfiguredMimeTypes.java b/java/com/google/gerrit/entities/ConfiguredMimeTypes.java index c28a573dd0..6ba89c9775 100644 --- a/java/com/google/gerrit/entities/ConfiguredMimeTypes.java +++ b/java/com/google/gerrit/entities/ConfiguredMimeTypes.java @@ -33,7 +33,7 @@ public abstract class ConfiguredMimeTypes { private static final String MIMETYPE = "mimetype"; private static final String KEY_PATH = "path"; - protected abstract ImmutableList matchers(); + public abstract ImmutableList matchers(); public static ConfiguredMimeTypes create(String projectName, Config rc) { Set types = rc.getSubsections(MIMETYPE); @@ -58,6 +58,10 @@ public abstract class ConfiguredMimeTypes { return new AutoValue_ConfiguredMimeTypes(matchers.build()); } + public static ConfiguredMimeTypes create(ImmutableList matchers) { + return new AutoValue_ConfiguredMimeTypes(matchers); + } + @Nullable public String getMimeType(String path) { for (TypeMatcher m : matchers()) { diff --git a/java/com/google/gerrit/common/data/ContributorAgreement.java b/java/com/google/gerrit/entities/ContributorAgreement.java similarity index 95% rename from java/com/google/gerrit/common/data/ContributorAgreement.java rename to java/com/google/gerrit/entities/ContributorAgreement.java index 0f103678fa..1d933b5ce2 100644 --- a/java/com/google/gerrit/common/data/ContributorAgreement.java +++ b/java/com/google/gerrit/entities/ContributorAgreement.java @@ -12,13 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.common.data; +package com.google.gerrit.entities; import com.google.auto.value.AutoValue; import com.google.common.collect.ImmutableList; import com.google.gerrit.common.Nullable; -import com.google.gerrit.entities.GroupReference; -import com.google.gerrit.entities.Project; import java.util.List; /** Portion of a {@link Project} describing a single contributor agreement. */ diff --git a/java/com/google/gerrit/entities/GroupReference.java b/java/com/google/gerrit/entities/GroupReference.java index 9185d5341b..208ba0f6bb 100644 --- a/java/com/google/gerrit/entities/GroupReference.java +++ b/java/com/google/gerrit/entities/GroupReference.java @@ -19,7 +19,7 @@ import static java.util.Objects.requireNonNull; import com.google.auto.value.AutoValue; import com.google.gerrit.common.Nullable; -/** Describes a group within a projects {@link com.google.gerrit.common.data.AccessSection}s. */ +/** Describes a group within a projects {@link AccessSection}s. */ @AutoValue public abstract class GroupReference implements Comparable { diff --git a/java/com/google/gerrit/common/data/LabelFunction.java b/java/com/google/gerrit/entities/LabelFunction.java similarity index 93% rename from java/com/google/gerrit/common/data/LabelFunction.java rename to java/com/google/gerrit/entities/LabelFunction.java index 6af675bd35..f361741297 100644 --- a/java/com/google/gerrit/common/data/LabelFunction.java +++ b/java/com/google/gerrit/entities/LabelFunction.java @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.common.data; +package com.google.gerrit.entities; import com.google.gerrit.common.Nullable; -import com.google.gerrit.entities.PatchSetApproval; +import com.google.gerrit.entities.SubmitRecord.Label; import java.util.Collections; import java.util.LinkedHashMap; import java.util.Map; @@ -88,8 +88,8 @@ public enum LabelFunction { return requiresMaxValue; } - public SubmitRecord.Label check(LabelType labelType, Iterable approvals) { - SubmitRecord.Label submitRecordLabel = new SubmitRecord.Label(); + public Label check(LabelType labelType, Iterable approvals) { + Label submitRecordLabel = new Label(); submitRecordLabel.label = labelType.getName(); submitRecordLabel.status = SubmitRecord.Label.Status.MAY; diff --git a/java/com/google/gerrit/common/data/LabelType.java b/java/com/google/gerrit/entities/LabelType.java similarity index 98% rename from java/com/google/gerrit/common/data/LabelType.java rename to java/com/google/gerrit/entities/LabelType.java index d272810c8b..a8d4da5339 100644 --- a/java/com/google/gerrit/common/data/LabelType.java +++ b/java/com/google/gerrit/entities/LabelType.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.common.data; +package com.google.gerrit.entities; import static java.util.Comparator.comparing; import static java.util.stream.Collectors.toList; @@ -21,9 +21,6 @@ import com.google.auto.value.AutoValue; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.gerrit.common.Nullable; -import com.google.gerrit.entities.LabelId; -import com.google.gerrit.entities.LabelValue; -import com.google.gerrit.entities.PatchSetApproval; import java.util.ArrayList; import java.util.Collection; import java.util.List; diff --git a/java/com/google/gerrit/common/data/LabelTypes.java b/java/com/google/gerrit/entities/LabelTypes.java similarity index 97% rename from java/com/google/gerrit/common/data/LabelTypes.java rename to java/com/google/gerrit/entities/LabelTypes.java index 1647658aad..1c38c59ec2 100644 --- a/java/com/google/gerrit/common/data/LabelTypes.java +++ b/java/com/google/gerrit/entities/LabelTypes.java @@ -12,9 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.common.data; +package com.google.gerrit.entities; -import com.google.gerrit.entities.LabelId; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; diff --git a/java/com/google/gerrit/common/data/Permission.java b/java/com/google/gerrit/entities/Permission.java similarity index 99% rename from java/com/google/gerrit/common/data/Permission.java rename to java/com/google/gerrit/entities/Permission.java index 6190957244..4f521a18aa 100644 --- a/java/com/google/gerrit/common/data/Permission.java +++ b/java/com/google/gerrit/entities/Permission.java @@ -12,14 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.common.data; +package com.google.gerrit.entities; import static com.google.common.collect.ImmutableList.toImmutableList; import com.google.auto.value.AutoValue; import com.google.common.collect.ImmutableList; import com.google.gerrit.common.Nullable; -import com.google.gerrit.entities.GroupReference; import java.util.ArrayList; import java.util.Iterator; import java.util.List; diff --git a/java/com/google/gerrit/common/data/PermissionRange.java b/java/com/google/gerrit/entities/PermissionRange.java similarity index 98% rename from java/com/google/gerrit/common/data/PermissionRange.java rename to java/com/google/gerrit/entities/PermissionRange.java index 97c37315d1..fa9f4c27a8 100644 --- a/java/com/google/gerrit/common/data/PermissionRange.java +++ b/java/com/google/gerrit/entities/PermissionRange.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.common.data; +package com.google.gerrit.entities; import java.util.ArrayList; import java.util.List; diff --git a/java/com/google/gerrit/common/data/PermissionRule.java b/java/com/google/gerrit/entities/PermissionRule.java similarity index 98% rename from java/com/google/gerrit/common/data/PermissionRule.java rename to java/com/google/gerrit/entities/PermissionRule.java index 1d2230c618..f67da5ef8c 100644 --- a/java/com/google/gerrit/common/data/PermissionRule.java +++ b/java/com/google/gerrit/entities/PermissionRule.java @@ -12,10 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.common.data; +package com.google.gerrit.entities; import com.google.auto.value.AutoValue; -import com.google.gerrit.entities.GroupReference; @AutoValue public abstract class PermissionRule implements Comparable { diff --git a/java/com/google/gerrit/common/data/SubmitRecord.java b/java/com/google/gerrit/entities/SubmitRecord.java similarity index 98% rename from java/com/google/gerrit/common/data/SubmitRecord.java rename to java/com/google/gerrit/entities/SubmitRecord.java index fe5843ad41..67c6007329 100644 --- a/java/com/google/gerrit/common/data/SubmitRecord.java +++ b/java/com/google/gerrit/entities/SubmitRecord.java @@ -12,9 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.common.data; +package com.google.gerrit.entities; -import com.google.gerrit.entities.Account; import java.util.Collection; import java.util.List; import java.util.Objects; diff --git a/java/com/google/gerrit/common/data/SubmitRequirement.java b/java/com/google/gerrit/entities/SubmitRequirement.java similarity index 97% rename from java/com/google/gerrit/common/data/SubmitRequirement.java rename to java/com/google/gerrit/entities/SubmitRequirement.java index 2c341bf35c..f9301a402d 100644 --- a/java/com/google/gerrit/common/data/SubmitRequirement.java +++ b/java/com/google/gerrit/entities/SubmitRequirement.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.common.data; +package com.google.gerrit.entities; import static com.google.common.base.Preconditions.checkState; diff --git a/java/com/google/gerrit/common/data/SubmitTypeRecord.java b/java/com/google/gerrit/entities/SubmitTypeRecord.java similarity index 98% rename from java/com/google/gerrit/common/data/SubmitTypeRecord.java rename to java/com/google/gerrit/entities/SubmitTypeRecord.java index afb3bac1dc..492d637bd0 100644 --- a/java/com/google/gerrit/common/data/SubmitTypeRecord.java +++ b/java/com/google/gerrit/entities/SubmitTypeRecord.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.common.data; +package com.google.gerrit.entities; import com.google.gerrit.extensions.client.SubmitType; diff --git a/java/com/google/gerrit/common/data/SubscribeSection.java b/java/com/google/gerrit/entities/SubscribeSection.java similarity index 97% rename from java/com/google/gerrit/common/data/SubscribeSection.java rename to java/com/google/gerrit/entities/SubscribeSection.java index 533a2f0a15..b95517c599 100644 --- a/java/com/google/gerrit/common/data/SubscribeSection.java +++ b/java/com/google/gerrit/entities/SubscribeSection.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.common.data; +package com.google.gerrit.entities; import static com.google.common.collect.ImmutableList.toImmutableList; @@ -20,8 +20,6 @@ import com.google.auto.value.AutoValue; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.flogger.FluentLogger; -import com.google.gerrit.entities.BranchNameKey; -import com.google.gerrit.entities.Project; import java.util.Collection; import java.util.HashSet; import java.util.Set; diff --git a/java/com/google/gerrit/extensions/common/TestSubmitRuleInfo.java b/java/com/google/gerrit/extensions/common/TestSubmitRuleInfo.java index 4170797ea5..deb03b0d54 100644 --- a/java/com/google/gerrit/extensions/common/TestSubmitRuleInfo.java +++ b/java/com/google/gerrit/extensions/common/TestSubmitRuleInfo.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; public class TestSubmitRuleInfo { - /** @see com.google.gerrit.common.data.SubmitRecord.Status */ + /** @see com.google.gerrit.entities.SubmitRecord.Status */ public String status; public String errorMessage; diff --git a/java/com/google/gerrit/pgm/init/InitLabels.java b/java/com/google/gerrit/pgm/init/InitLabels.java index 0797cf9e0a..3edc732323 100644 --- a/java/com/google/gerrit/pgm/init/InitLabels.java +++ b/java/com/google/gerrit/pgm/init/InitLabels.java @@ -14,7 +14,7 @@ package com.google.gerrit.pgm.init; -import static com.google.gerrit.common.data.LabelFunction.MAX_WITH_BLOCK; +import static com.google.gerrit.entities.LabelFunction.MAX_WITH_BLOCK; import com.google.gerrit.pgm.init.api.AllProjectsConfig; import com.google.gerrit.pgm.init.api.ConsoleUI; diff --git a/java/com/google/gerrit/server/ApprovalInference.java b/java/com/google/gerrit/server/ApprovalInference.java index 417a4ef321..aa3ef89deb 100644 --- a/java/com/google/gerrit/server/ApprovalInference.java +++ b/java/com/google/gerrit/server/ApprovalInference.java @@ -23,8 +23,8 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.Table; import com.google.common.flogger.FluentLogger; import com.google.gerrit.common.Nullable; -import com.google.gerrit.common.data.LabelType; import com.google.gerrit.entities.Account; +import com.google.gerrit.entities.LabelType; import com.google.gerrit.entities.PatchSet; import com.google.gerrit.entities.PatchSetApproval; import com.google.gerrit.extensions.client.ChangeKind; diff --git a/java/com/google/gerrit/server/ApprovalsUtil.java b/java/com/google/gerrit/server/ApprovalsUtil.java index 0280aee553..a92ce3d061 100644 --- a/java/com/google/gerrit/server/ApprovalsUtil.java +++ b/java/com/google/gerrit/server/ApprovalsUtil.java @@ -27,11 +27,11 @@ import com.google.common.collect.Lists; import com.google.common.collect.Sets; import com.google.common.flogger.FluentLogger; import com.google.gerrit.common.Nullable; -import com.google.gerrit.common.data.LabelType; -import com.google.gerrit.common.data.LabelTypes; import com.google.gerrit.entities.Account; import com.google.gerrit.entities.Change; import com.google.gerrit.entities.LabelId; +import com.google.gerrit.entities.LabelType; +import com.google.gerrit.entities.LabelTypes; import com.google.gerrit.entities.PatchSet; import com.google.gerrit.entities.PatchSetApproval; import com.google.gerrit.entities.PatchSetInfo; diff --git a/java/com/google/gerrit/server/CreateGroupPermissionSyncer.java b/java/com/google/gerrit/server/CreateGroupPermissionSyncer.java index 0e593b7c5e..6c76de7c62 100644 --- a/java/com/google/gerrit/server/CreateGroupPermissionSyncer.java +++ b/java/com/google/gerrit/server/CreateGroupPermissionSyncer.java @@ -16,9 +16,9 @@ package com.google.gerrit.server; import com.google.common.collect.Sets; import com.google.common.flogger.FluentLogger; -import com.google.gerrit.common.data.AccessSection; -import com.google.gerrit.common.data.Permission; -import com.google.gerrit.common.data.PermissionRule; +import com.google.gerrit.entities.AccessSection; +import com.google.gerrit.entities.Permission; +import com.google.gerrit.entities.PermissionRule; import com.google.gerrit.entities.RefNames; import com.google.gerrit.extensions.events.ChangeMergedListener; import com.google.gerrit.server.config.AllProjectsName; diff --git a/java/com/google/gerrit/server/PatchSetUtil.java b/java/com/google/gerrit/server/PatchSetUtil.java index aeef2b6492..005ae3b32c 100644 --- a/java/com/google/gerrit/server/PatchSetUtil.java +++ b/java/com/google/gerrit/server/PatchSetUtil.java @@ -22,9 +22,9 @@ import com.google.common.collect.ImmutableCollection; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; import com.google.gerrit.common.Nullable; -import com.google.gerrit.common.data.LabelFunction; -import com.google.gerrit.common.data.LabelType; import com.google.gerrit.entities.Change; +import com.google.gerrit.entities.LabelFunction; +import com.google.gerrit.entities.LabelType; import com.google.gerrit.entities.PatchSet; import com.google.gerrit.entities.PatchSetApproval; import com.google.gerrit.entities.Project; diff --git a/java/com/google/gerrit/server/account/AccountControl.java b/java/com/google/gerrit/server/account/AccountControl.java index a6143f4b07..6a48cce32d 100644 --- a/java/com/google/gerrit/server/account/AccountControl.java +++ b/java/com/google/gerrit/server/account/AccountControl.java @@ -17,9 +17,10 @@ package com.google.gerrit.server.account; import static java.util.stream.Collectors.toSet; import com.google.common.flogger.FluentLogger; -import com.google.gerrit.common.data.PermissionRule; import com.google.gerrit.entities.Account; import com.google.gerrit.entities.AccountGroup; +import com.google.gerrit.entities.AccountsSection; +import com.google.gerrit.entities.PermissionRule; import com.google.gerrit.exceptions.NoSuchGroupException; import com.google.gerrit.extensions.common.AccountVisibility; import com.google.gerrit.extensions.restapi.AuthException; @@ -29,7 +30,6 @@ import com.google.gerrit.server.group.SystemGroupBackend; import com.google.gerrit.server.permissions.GlobalPermission; import com.google.gerrit.server.permissions.PermissionBackend; import com.google.gerrit.server.permissions.PermissionBackendException; -import com.google.gerrit.server.project.AccountsSection; import com.google.gerrit.server.project.ProjectCache; import com.google.inject.Inject; import com.google.inject.Provider; diff --git a/java/com/google/gerrit/server/account/AccountLimits.java b/java/com/google/gerrit/server/account/AccountLimits.java index 4d1d1b8e9f..1845f5bbc5 100644 --- a/java/com/google/gerrit/server/account/AccountLimits.java +++ b/java/com/google/gerrit/server/account/AccountLimits.java @@ -15,8 +15,8 @@ package com.google.gerrit.server.account; import com.google.gerrit.common.data.GlobalCapability; -import com.google.gerrit.common.data.PermissionRange; -import com.google.gerrit.common.data.PermissionRule; +import com.google.gerrit.entities.PermissionRange; +import com.google.gerrit.entities.PermissionRule; import com.google.gerrit.index.query.QueryProcessor; import com.google.gerrit.server.CurrentUser; import com.google.gerrit.server.git.QueueProvider; diff --git a/java/com/google/gerrit/server/account/AccountManager.java b/java/com/google/gerrit/server/account/AccountManager.java index cb9412cd4a..47c6efb977 100644 --- a/java/com/google/gerrit/server/account/AccountManager.java +++ b/java/com/google/gerrit/server/account/AccountManager.java @@ -24,11 +24,11 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; import com.google.common.flogger.FluentLogger; -import com.google.gerrit.common.data.AccessSection; import com.google.gerrit.common.data.GlobalCapability; -import com.google.gerrit.common.data.Permission; +import com.google.gerrit.entities.AccessSection; import com.google.gerrit.entities.Account; import com.google.gerrit.entities.AccountGroup; +import com.google.gerrit.entities.Permission; import com.google.gerrit.exceptions.NoSuchGroupException; import com.google.gerrit.exceptions.StorageException; import com.google.gerrit.extensions.client.AccountFieldName; diff --git a/java/com/google/gerrit/server/account/CapabilityCollection.java b/java/com/google/gerrit/server/account/CapabilityCollection.java index c1a8f734b2..27b5aa8877 100644 --- a/java/com/google/gerrit/server/account/CapabilityCollection.java +++ b/java/com/google/gerrit/server/account/CapabilityCollection.java @@ -18,12 +18,12 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.gerrit.common.Nullable; -import com.google.gerrit.common.data.AccessSection; import com.google.gerrit.common.data.GlobalCapability; -import com.google.gerrit.common.data.Permission; -import com.google.gerrit.common.data.PermissionRange; -import com.google.gerrit.common.data.PermissionRule; +import com.google.gerrit.entities.AccessSection; import com.google.gerrit.entities.GroupReference; +import com.google.gerrit.entities.Permission; +import com.google.gerrit.entities.PermissionRange; +import com.google.gerrit.entities.PermissionRule; import com.google.gerrit.server.config.AdministrateServerGroups; import com.google.gerrit.server.group.SystemGroupBackend; import com.google.inject.Inject; diff --git a/java/com/google/gerrit/server/cache/serialize/entities/AccessSectionSerializer.java b/java/com/google/gerrit/server/cache/serialize/entities/AccessSectionSerializer.java index af5fefd6ea..f572c62016 100644 --- a/java/com/google/gerrit/server/cache/serialize/entities/AccessSectionSerializer.java +++ b/java/com/google/gerrit/server/cache/serialize/entities/AccessSectionSerializer.java @@ -16,8 +16,8 @@ package com.google.gerrit.server.cache.serialize.entities; import static com.google.common.collect.ImmutableList.toImmutableList; -import com.google.gerrit.common.data.AccessSection; -import com.google.gerrit.common.data.Permission; +import com.google.gerrit.entities.AccessSection; +import com.google.gerrit.entities.Permission; import com.google.gerrit.server.cache.proto.Cache; /** Helper to (de)serialize values for caches. */ diff --git a/java/com/google/gerrit/server/cache/serialize/entities/BUILD b/java/com/google/gerrit/server/cache/serialize/entities/BUILD index 5fd28ec560..cb8c4ae98c 100644 --- a/java/com/google/gerrit/server/cache/serialize/entities/BUILD +++ b/java/com/google/gerrit/server/cache/serialize/entities/BUILD @@ -11,6 +11,7 @@ java_library( "//java/com/google/gerrit/extensions:api", "//java/com/google/gerrit/git", "//java/com/google/gerrit/proto", + "//java/com/google/gerrit/server/cache/serialize", "//lib:guava", "//lib:jgit", "//lib:protobuf", diff --git a/java/com/google/gerrit/server/cache/serialize/entities/CachedProjectConfigSerializer.java b/java/com/google/gerrit/server/cache/serialize/entities/CachedProjectConfigSerializer.java new file mode 100644 index 0000000000..789a00ccd4 --- /dev/null +++ b/java/com/google/gerrit/server/cache/serialize/entities/CachedProjectConfigSerializer.java @@ -0,0 +1,157 @@ +// Copyright (C) 2020 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.server.cache.serialize.entities; + +import static com.google.common.collect.ImmutableList.toImmutableList; + +import com.google.common.collect.ImmutableList; +import com.google.gerrit.entities.AccountsSection; +import com.google.gerrit.entities.CachedProjectConfig; +import com.google.gerrit.entities.ConfiguredMimeTypes; +import com.google.gerrit.entities.PermissionRule; +import com.google.gerrit.server.cache.proto.Cache; +import com.google.gerrit.server.cache.serialize.ObjectIdConverter; +import java.util.Optional; + +/** Helper to (de)serialize values for caches. */ +public class CachedProjectConfigSerializer { + public static CachedProjectConfig deserialize(Cache.CachedProjectConfigProto proto) { + CachedProjectConfig.Builder builder = + CachedProjectConfig.builder() + .setProject(ProjectSerializer.deserialize(proto.getProject())) + .setMaxObjectSizeLimit(proto.getMaxObjectSizeLimit()) + .setCheckReceivedObjects(proto.getCheckReceivedObjects()); + if (proto.hasBranchOrderSection()) { + builder.setBranchOrderSection( + Optional.of(BranchOrderSectionSerializer.deserialize(proto.getBranchOrderSection()))); + } + ImmutableList matchers = + proto.getMimeTypesList().stream() + .map(ConfiguredMimeTypeSerializer::deserialize) + .collect(toImmutableList()); + builder.setMimeTypes(ConfiguredMimeTypes.create(matchers)); + if (!proto.getRulesId().isEmpty()) { + builder.setRulesId( + Optional.of(ObjectIdConverter.create().fromByteString(proto.getRulesId()))); + } + if (!proto.getRevision().isEmpty()) { + builder.setRevision( + Optional.of(ObjectIdConverter.create().fromByteString(proto.getRevision()))); + } + proto + .getExtensionPanelsMap() + .entrySet() + .forEach( + panelSection -> { + builder + .extensionPanelSectionsBuilder() + .put( + panelSection.getKey(), + panelSection.getValue().getSectionList().stream().collect(toImmutableList())); + }); + ImmutableList accounts = + proto.getAccountsSectionList().stream() + .map(PermissionRuleSerializer::deserialize) + .collect(toImmutableList()); + builder.setAccountsSection(AccountsSection.create(accounts)); + + proto.getGroupListList().stream() + .map(GroupReferenceSerializer::deserialize) + .forEach(builder::addGroup); + proto.getAccessSectionsList().stream() + .map(AccessSectionSerializer::deserialize) + .forEach(builder::addAccessSection); + proto.getContributorAgreementsList().stream() + .map(ContributorAgreementSerializer::deserialize) + .forEach(builder::addContributorAgreement); + proto.getNotifyConfigsList().stream() + .map(NotifyConfigSerializer::deserialize) + .forEach(builder::addNotifySection); + proto.getLabelSectionsList().stream() + .map(LabelTypeSerializer::deserialize) + .forEach(builder::addLabelSection); + proto.getSubscribeSectionsList().stream() + .map(SubscribeSectionSerializer::deserialize) + .forEach(builder::addSubscribeSection); + proto.getCommentLinksList().stream() + .map(StoredCommentLinkInfoSerializer::deserialize) + .forEach(builder::addCommentLinkSection); + + return builder.build(); + } + + public static Cache.CachedProjectConfigProto serialize(CachedProjectConfig autoValue) { + Cache.CachedProjectConfigProto.Builder builder = + Cache.CachedProjectConfigProto.newBuilder() + .setProject(ProjectSerializer.serialize(autoValue.getProject())) + .setMaxObjectSizeLimit(autoValue.getMaxObjectSizeLimit()) + .setCheckReceivedObjects(autoValue.getCheckReceivedObjects()); + + if (autoValue.getBranchOrderSection().isPresent()) { + builder.setBranchOrderSection( + BranchOrderSectionSerializer.serialize(autoValue.getBranchOrderSection().get())); + } + autoValue.getMimeTypes().matchers().stream() + .map(ConfiguredMimeTypeSerializer::serialize) + .forEach(builder::addMimeTypes); + + if (autoValue.getRulesId().isPresent()) { + builder.setRulesId(ObjectIdConverter.create().toByteString(autoValue.getRulesId().get())); + } + if (autoValue.getRevision().isPresent()) { + builder.setRevision(ObjectIdConverter.create().toByteString(autoValue.getRevision().get())); + } + + autoValue + .getExtensionPanelSections() + .entrySet() + .forEach( + panelSection -> { + builder.putExtensionPanels( + panelSection.getKey(), + Cache.CachedProjectConfigProto.ExtensionPanelSectionProto.newBuilder() + .addAllSection(panelSection.getValue()) + .build()); + }); + autoValue.getAccountsSection().getSameGroupVisibility().stream() + .map(PermissionRuleSerializer::serialize) + .forEach(builder::addAccountsSection); + + autoValue.getGroups().values().stream() + .map(GroupReferenceSerializer::serialize) + .forEach(builder::addGroupList); + autoValue.getAccessSections().values().stream() + .map(AccessSectionSerializer::serialize) + .forEach(builder::addAccessSections); + autoValue.getContributorAgreements().values().stream() + .map(ContributorAgreementSerializer::serialize) + .forEach(builder::addContributorAgreements); + autoValue.getNotifySections().values().stream() + .map(NotifyConfigSerializer::serialize) + .forEach(builder::addNotifyConfigs); + autoValue.getLabelSections().values().stream() + .map(LabelTypeSerializer::serialize) + .forEach(builder::addLabelSections); + autoValue.getSubscribeSections().values().stream() + .map(SubscribeSectionSerializer::serialize) + .forEach(builder::addSubscribeSections); + autoValue.getCommentLinkSections().values().stream() + .map(StoredCommentLinkInfoSerializer::serialize) + .forEach(builder::addCommentLinks); + return builder.build(); + } + + private CachedProjectConfigSerializer() {} +} diff --git a/java/com/google/gerrit/server/cache/serialize/entities/ContributorAgreementSerializer.java b/java/com/google/gerrit/server/cache/serialize/entities/ContributorAgreementSerializer.java index 54d0703984..19edf4f78a 100644 --- a/java/com/google/gerrit/server/cache/serialize/entities/ContributorAgreementSerializer.java +++ b/java/com/google/gerrit/server/cache/serialize/entities/ContributorAgreementSerializer.java @@ -18,7 +18,7 @@ import static com.google.common.base.Strings.emptyToNull; import static com.google.common.base.Strings.nullToEmpty; import static com.google.common.collect.ImmutableList.toImmutableList; -import com.google.gerrit.common.data.ContributorAgreement; +import com.google.gerrit.entities.ContributorAgreement; import com.google.gerrit.server.cache.proto.Cache; /** Helper to (de)serialize values for caches. */ diff --git a/java/com/google/gerrit/server/cache/serialize/entities/LabelTypeSerializer.java b/java/com/google/gerrit/server/cache/serialize/entities/LabelTypeSerializer.java index 1566e22dca..b7d02d40a9 100644 --- a/java/com/google/gerrit/server/cache/serialize/entities/LabelTypeSerializer.java +++ b/java/com/google/gerrit/server/cache/serialize/entities/LabelTypeSerializer.java @@ -20,8 +20,8 @@ import com.google.common.base.Converter; import com.google.common.base.Enums; import com.google.common.collect.ImmutableList; import com.google.common.primitives.Shorts; -import com.google.gerrit.common.data.LabelFunction; -import com.google.gerrit.common.data.LabelType; +import com.google.gerrit.entities.LabelFunction; +import com.google.gerrit.entities.LabelType; import com.google.gerrit.server.cache.proto.Cache; /** Helper to (de)serialize values for caches. */ diff --git a/java/com/google/gerrit/server/cache/serialize/entities/PermissionRuleSerializer.java b/java/com/google/gerrit/server/cache/serialize/entities/PermissionRuleSerializer.java index d310f18209..41fb85f794 100644 --- a/java/com/google/gerrit/server/cache/serialize/entities/PermissionRuleSerializer.java +++ b/java/com/google/gerrit/server/cache/serialize/entities/PermissionRuleSerializer.java @@ -16,7 +16,7 @@ package com.google.gerrit.server.cache.serialize.entities; import com.google.common.base.Converter; import com.google.common.base.Enums; -import com.google.gerrit.common.data.PermissionRule; +import com.google.gerrit.entities.PermissionRule; import com.google.gerrit.server.cache.proto.Cache; /** Helper to (de)serialize values for caches. */ diff --git a/java/com/google/gerrit/server/cache/serialize/entities/PermissionSerializer.java b/java/com/google/gerrit/server/cache/serialize/entities/PermissionSerializer.java index 983d9267d8..01d3393d01 100644 --- a/java/com/google/gerrit/server/cache/serialize/entities/PermissionSerializer.java +++ b/java/com/google/gerrit/server/cache/serialize/entities/PermissionSerializer.java @@ -16,8 +16,8 @@ package com.google.gerrit.server.cache.serialize.entities; import static com.google.common.collect.ImmutableList.toImmutableList; -import com.google.gerrit.common.data.Permission; -import com.google.gerrit.common.data.PermissionRule; +import com.google.gerrit.entities.Permission; +import com.google.gerrit.entities.PermissionRule; import com.google.gerrit.server.cache.proto.Cache; /** Helper to (de)serialize values for caches. */ diff --git a/java/com/google/gerrit/server/cache/serialize/entities/SubscribeSectionSerializer.java b/java/com/google/gerrit/server/cache/serialize/entities/SubscribeSectionSerializer.java index 6125818d85..2046f3a7c3 100644 --- a/java/com/google/gerrit/server/cache/serialize/entities/SubscribeSectionSerializer.java +++ b/java/com/google/gerrit/server/cache/serialize/entities/SubscribeSectionSerializer.java @@ -14,8 +14,8 @@ package com.google.gerrit.server.cache.serialize.entities; -import com.google.gerrit.common.data.SubscribeSection; import com.google.gerrit.entities.Project; +import com.google.gerrit.entities.SubscribeSection; import com.google.gerrit.server.cache.proto.Cache; /** Helper to (de)serialize values for caches. */ diff --git a/java/com/google/gerrit/server/change/ChangeInserter.java b/java/com/google/gerrit/server/change/ChangeInserter.java index b749270ff5..d8d000330c 100644 --- a/java/com/google/gerrit/server/change/ChangeInserter.java +++ b/java/com/google/gerrit/server/change/ChangeInserter.java @@ -29,12 +29,12 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Streams; import com.google.common.flogger.FluentLogger; import com.google.gerrit.common.FooterConstants; -import com.google.gerrit.common.data.LabelType; -import com.google.gerrit.common.data.LabelTypes; import com.google.gerrit.entities.Account; import com.google.gerrit.entities.BranchNameKey; import com.google.gerrit.entities.Change; import com.google.gerrit.entities.ChangeMessage; +import com.google.gerrit.entities.LabelType; +import com.google.gerrit.entities.LabelTypes; import com.google.gerrit.entities.PatchSet; import com.google.gerrit.entities.PatchSetApproval; import com.google.gerrit.entities.PatchSetInfo; diff --git a/java/com/google/gerrit/server/change/ChangeJson.java b/java/com/google/gerrit/server/change/ChangeJson.java index 31df6a4834..014955c903 100644 --- a/java/com/google/gerrit/server/change/ChangeJson.java +++ b/java/com/google/gerrit/server/change/ChangeJson.java @@ -46,10 +46,6 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; import com.google.common.flogger.FluentLogger; -import com.google.gerrit.common.data.SubmitRecord; -import com.google.gerrit.common.data.SubmitRecord.Status; -import com.google.gerrit.common.data.SubmitRequirement; -import com.google.gerrit.common.data.SubmitTypeRecord; import com.google.gerrit.entities.Account; import com.google.gerrit.entities.Address; import com.google.gerrit.entities.Change; @@ -57,6 +53,10 @@ import com.google.gerrit.entities.ChangeMessage; import com.google.gerrit.entities.PatchSet; import com.google.gerrit.entities.PatchSetApproval; import com.google.gerrit.entities.Project; +import com.google.gerrit.entities.SubmitRecord; +import com.google.gerrit.entities.SubmitRecord.Status; +import com.google.gerrit.entities.SubmitRequirement; +import com.google.gerrit.entities.SubmitTypeRecord; import com.google.gerrit.exceptions.StorageException; import com.google.gerrit.extensions.api.changes.FixInput; import com.google.gerrit.extensions.client.ListChangesOption; diff --git a/java/com/google/gerrit/server/change/DeleteReviewerOp.java b/java/com/google/gerrit/server/change/DeleteReviewerOp.java index 68d91841b7..07cb04f3f8 100644 --- a/java/com/google/gerrit/server/change/DeleteReviewerOp.java +++ b/java/com/google/gerrit/server/change/DeleteReviewerOp.java @@ -18,11 +18,11 @@ import static com.google.gerrit.server.project.ProjectCache.illegalState; import com.google.common.collect.Iterables; import com.google.common.flogger.FluentLogger; -import com.google.gerrit.common.data.LabelType; -import com.google.gerrit.common.data.LabelTypes; import com.google.gerrit.entities.Account; import com.google.gerrit.entities.Change; import com.google.gerrit.entities.ChangeMessage; +import com.google.gerrit.entities.LabelType; +import com.google.gerrit.entities.LabelTypes; import com.google.gerrit.entities.PatchSet; import com.google.gerrit.entities.PatchSetApproval; import com.google.gerrit.entities.Project; diff --git a/java/com/google/gerrit/server/change/LabelNormalizer.java b/java/com/google/gerrit/server/change/LabelNormalizer.java index 619b939247..30343d41d3 100644 --- a/java/com/google/gerrit/server/change/LabelNormalizer.java +++ b/java/com/google/gerrit/server/change/LabelNormalizer.java @@ -22,9 +22,9 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; -import com.google.gerrit.common.data.LabelType; -import com.google.gerrit.common.data.LabelTypes; import com.google.gerrit.entities.Change; +import com.google.gerrit.entities.LabelType; +import com.google.gerrit.entities.LabelTypes; import com.google.gerrit.entities.LabelValue; import com.google.gerrit.entities.PatchSetApproval; import com.google.gerrit.server.notedb.ChangeNotes; diff --git a/java/com/google/gerrit/server/change/LabelsJson.java b/java/com/google/gerrit/server/change/LabelsJson.java index d9e81b1500..b1d154cf1a 100644 --- a/java/com/google/gerrit/server/change/LabelsJson.java +++ b/java/com/google/gerrit/server/change/LabelsJson.java @@ -32,12 +32,12 @@ import com.google.common.collect.Table; import com.google.common.flogger.FluentLogger; import com.google.common.primitives.Ints; import com.google.gerrit.common.Nullable; -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.entities.Account; +import com.google.gerrit.entities.LabelType; +import com.google.gerrit.entities.LabelTypes; import com.google.gerrit.entities.LabelValue; import com.google.gerrit.entities.PatchSetApproval; +import com.google.gerrit.entities.SubmitRecord; import com.google.gerrit.extensions.client.ListChangesOption; import com.google.gerrit.extensions.common.ApprovalInfo; import com.google.gerrit.extensions.common.LabelInfo; diff --git a/java/com/google/gerrit/server/change/ReviewerJson.java b/java/com/google/gerrit/server/change/ReviewerJson.java index d493fd0576..a3136d4a94 100644 --- a/java/com/google/gerrit/server/change/ReviewerJson.java +++ b/java/com/google/gerrit/server/change/ReviewerJson.java @@ -18,13 +18,13 @@ import static com.google.gerrit.entities.LabelValue.formatValue; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; -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.entities.Account; import com.google.gerrit.entities.Address; +import com.google.gerrit.entities.LabelType; +import com.google.gerrit.entities.LabelTypes; import com.google.gerrit.entities.PatchSet; import com.google.gerrit.entities.PatchSetApproval; +import com.google.gerrit.entities.SubmitRecord; import com.google.gerrit.extensions.api.changes.ReviewerInfo; import com.google.gerrit.extensions.restapi.AuthException; import com.google.gerrit.server.ApprovalsUtil; diff --git a/java/com/google/gerrit/server/config/AdministrateServerGroupsProvider.java b/java/com/google/gerrit/server/config/AdministrateServerGroupsProvider.java index 64937db29d..9f6ecfb53e 100644 --- a/java/com/google/gerrit/server/config/AdministrateServerGroupsProvider.java +++ b/java/com/google/gerrit/server/config/AdministrateServerGroupsProvider.java @@ -16,8 +16,8 @@ package com.google.gerrit.server.config; import com.google.common.collect.ImmutableSet; import com.google.common.flogger.FluentLogger; -import com.google.gerrit.common.data.PermissionRule; import com.google.gerrit.entities.GroupReference; +import com.google.gerrit.entities.PermissionRule; import com.google.gerrit.server.account.GroupBackend; import com.google.gerrit.server.account.GroupBackends; import com.google.gerrit.server.util.RequestContext; diff --git a/java/com/google/gerrit/server/data/SubmitLabelAttribute.java b/java/com/google/gerrit/server/data/SubmitLabelAttribute.java index fec8f7f4ce..3a63ca150a 100644 --- a/java/com/google/gerrit/server/data/SubmitLabelAttribute.java +++ b/java/com/google/gerrit/server/data/SubmitLabelAttribute.java @@ -14,9 +14,11 @@ package com.google.gerrit.server.data; +import com.google.gerrit.entities.SubmitRecord; + /** - * Represents a {@link com.google.gerrit.common.data.SubmitRecord.Label} that does not depend on - * Gerrit internal classes, to be serialized. + * Represents a {@link SubmitRecord.Label} that does not depend on Gerrit internal classes, to be + * serialized. */ public class SubmitLabelAttribute { public String label; diff --git a/java/com/google/gerrit/server/data/SubmitRecordAttribute.java b/java/com/google/gerrit/server/data/SubmitRecordAttribute.java index 2c3d4010ac..e6c308e046 100644 --- a/java/com/google/gerrit/server/data/SubmitRecordAttribute.java +++ b/java/com/google/gerrit/server/data/SubmitRecordAttribute.java @@ -14,11 +14,12 @@ package com.google.gerrit.server.data; +import com.google.gerrit.entities.SubmitRecord; import java.util.List; /** - * Represents a {@link com.google.gerrit.common.data.SubmitRecord} that does not depend on Gerrit - * internal classes, to be serialized. + * Represents a {@link SubmitRecord} that does not depend on Gerrit internal classes, to be + * serialized. */ public class SubmitRecordAttribute { public String status; diff --git a/java/com/google/gerrit/server/data/SubmitRequirementAttribute.java b/java/com/google/gerrit/server/data/SubmitRequirementAttribute.java index 2364ec4302..ed4ea8a85b 100644 --- a/java/com/google/gerrit/server/data/SubmitRequirementAttribute.java +++ b/java/com/google/gerrit/server/data/SubmitRequirementAttribute.java @@ -14,9 +14,11 @@ package com.google.gerrit.server.data; +import com.google.gerrit.entities.SubmitRequirement; + /** - * Represents a {@link com.google.gerrit.common.data.SubmitRequirement} that does not depend on - * Gerrit internal classes, to be serialized + * Represents a {@link SubmitRequirement} that does not depend on Gerrit internal classes, to be + * serialized */ public class SubmitRequirementAttribute { public String type; diff --git a/java/com/google/gerrit/server/events/EventFactory.java b/java/com/google/gerrit/server/events/EventFactory.java index 19d2f3dddf..0c3c4fb583 100644 --- a/java/com/google/gerrit/server/events/EventFactory.java +++ b/java/com/google/gerrit/server/events/EventFactory.java @@ -20,17 +20,17 @@ import static java.util.Objects.requireNonNull; import com.google.common.collect.ListMultimap; import com.google.common.collect.Lists; import com.google.common.flogger.FluentLogger; -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.common.data.SubmitRequirement; import com.google.gerrit.entities.Account; import com.google.gerrit.entities.BranchNameKey; import com.google.gerrit.entities.Change; import com.google.gerrit.entities.ChangeMessage; import com.google.gerrit.entities.HumanComment; +import com.google.gerrit.entities.LabelType; +import com.google.gerrit.entities.LabelTypes; import com.google.gerrit.entities.PatchSet; import com.google.gerrit.entities.PatchSetApproval; +import com.google.gerrit.entities.SubmitRecord; +import com.google.gerrit.entities.SubmitRequirement; import com.google.gerrit.entities.UserIdentity; import com.google.gerrit.exceptions.StorageException; import com.google.gerrit.extensions.registration.DynamicItem; diff --git a/java/com/google/gerrit/server/events/StreamEventsApiListener.java b/java/com/google/gerrit/server/events/StreamEventsApiListener.java index f286eef359..1f901879f4 100644 --- a/java/com/google/gerrit/server/events/StreamEventsApiListener.java +++ b/java/com/google/gerrit/server/events/StreamEventsApiListener.java @@ -20,11 +20,11 @@ import com.google.common.base.Supplier; import com.google.common.base.Suppliers; import com.google.common.collect.Sets; import com.google.common.flogger.FluentLogger; -import com.google.gerrit.common.data.LabelType; -import com.google.gerrit.common.data.LabelTypes; import com.google.gerrit.entities.Account; import com.google.gerrit.entities.BranchNameKey; import com.google.gerrit.entities.Change; +import com.google.gerrit.entities.LabelType; +import com.google.gerrit.entities.LabelTypes; import com.google.gerrit.entities.PatchSet; import com.google.gerrit.entities.Project; import com.google.gerrit.exceptions.StorageException; diff --git a/java/com/google/gerrit/server/git/MergeUtil.java b/java/com/google/gerrit/server/git/MergeUtil.java index dccb97a0a9..7518a14bed 100644 --- a/java/com/google/gerrit/server/git/MergeUtil.java +++ b/java/com/google/gerrit/server/git/MergeUtil.java @@ -31,12 +31,12 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Sets; import com.google.common.flogger.FluentLogger; import com.google.gerrit.common.FooterConstants; -import com.google.gerrit.common.data.LabelType; import com.google.gerrit.entities.Account; import com.google.gerrit.entities.BooleanProjectConfig; import com.google.gerrit.entities.BranchNameKey; import com.google.gerrit.entities.Change; import com.google.gerrit.entities.LabelId; +import com.google.gerrit.entities.LabelType; import com.google.gerrit.entities.PatchSet; import com.google.gerrit.entities.PatchSetApproval; import com.google.gerrit.exceptions.InvalidMergeStrategyException; diff --git a/java/com/google/gerrit/server/git/receive/ReceiveCommits.java b/java/com/google/gerrit/server/git/receive/ReceiveCommits.java index 5d36e707ce..c3551cc2f4 100644 --- a/java/com/google/gerrit/server/git/receive/ReceiveCommits.java +++ b/java/com/google/gerrit/server/git/receive/ReceiveCommits.java @@ -63,13 +63,13 @@ import com.google.common.flogger.FluentLogger; import com.google.gerrit.common.FooterConstants; import com.google.gerrit.common.Nullable; import com.google.gerrit.common.UsedAt; -import com.google.gerrit.common.data.LabelType; -import com.google.gerrit.common.data.LabelTypes; import com.google.gerrit.entities.Account; import com.google.gerrit.entities.BooleanProjectConfig; import com.google.gerrit.entities.BranchNameKey; import com.google.gerrit.entities.Change; import com.google.gerrit.entities.HumanComment; +import com.google.gerrit.entities.LabelType; +import com.google.gerrit.entities.LabelTypes; import com.google.gerrit.entities.PatchSet; import com.google.gerrit.entities.PatchSetInfo; import com.google.gerrit.entities.Project; diff --git a/java/com/google/gerrit/server/git/receive/ReplaceOp.java b/java/com/google/gerrit/server/git/receive/ReplaceOp.java index b1cb2f9a1a..0cb5902beb 100644 --- a/java/com/google/gerrit/server/git/receive/ReplaceOp.java +++ b/java/com/google/gerrit/server/git/receive/ReplaceOp.java @@ -29,10 +29,10 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.Streams; import com.google.common.flogger.FluentLogger; import com.google.gerrit.common.Nullable; -import com.google.gerrit.common.data.LabelType; import com.google.gerrit.entities.BranchNameKey; import com.google.gerrit.entities.Change; import com.google.gerrit.entities.ChangeMessage; +import com.google.gerrit.entities.LabelType; import com.google.gerrit.entities.PatchSet; import com.google.gerrit.entities.PatchSetApproval; import com.google.gerrit.entities.PatchSetInfo; diff --git a/java/com/google/gerrit/server/group/db/RenameGroupOp.java b/java/com/google/gerrit/server/group/db/RenameGroupOp.java index 45dcdfc069..843b346684 100644 --- a/java/com/google/gerrit/server/group/db/RenameGroupOp.java +++ b/java/com/google/gerrit/server/group/db/RenameGroupOp.java @@ -18,12 +18,12 @@ import static com.google.gerrit.server.project.ProjectCache.illegalState; import com.google.common.flogger.FluentLogger; import com.google.gerrit.entities.AccountGroup; +import com.google.gerrit.entities.CachedProjectConfig; import com.google.gerrit.entities.GroupReference; import com.google.gerrit.entities.Project; import com.google.gerrit.server.git.DefaultQueueOp; import com.google.gerrit.server.git.WorkQueue; import com.google.gerrit.server.git.meta.MetaDataUpdate; -import com.google.gerrit.server.project.CachedProjectConfig; import com.google.gerrit.server.project.ProjectCache; import com.google.gerrit.server.project.ProjectConfig; import com.google.inject.Inject; diff --git a/java/com/google/gerrit/server/index/change/ChangeField.java b/java/com/google/gerrit/server/index/change/ChangeField.java index 160ac1498b..ef538cb09c 100644 --- a/java/com/google/gerrit/server/index/change/ChangeField.java +++ b/java/com/google/gerrit/server/index/change/ChangeField.java @@ -42,8 +42,6 @@ import com.google.common.collect.Table; import com.google.common.flogger.FluentLogger; import com.google.common.io.Files; import com.google.common.primitives.Longs; -import com.google.gerrit.common.data.SubmitRecord; -import com.google.gerrit.common.data.SubmitRequirement; import com.google.gerrit.entities.Account; import com.google.gerrit.entities.Address; import com.google.gerrit.entities.AttentionSetUpdate; @@ -52,6 +50,8 @@ import com.google.gerrit.entities.ChangeMessage; import com.google.gerrit.entities.PatchSetApproval; import com.google.gerrit.entities.Project; import com.google.gerrit.entities.RefNames; +import com.google.gerrit.entities.SubmitRecord; +import com.google.gerrit.entities.SubmitRequirement; import com.google.gerrit.entities.converter.ChangeProtoConverter; import com.google.gerrit.entities.converter.PatchSetApprovalProtoConverter; import com.google.gerrit.entities.converter.PatchSetProtoConverter; diff --git a/java/com/google/gerrit/server/mail/send/MergedSender.java b/java/com/google/gerrit/server/mail/send/MergedSender.java index 6ee6c68bb1..928bdc321d 100644 --- a/java/com/google/gerrit/server/mail/send/MergedSender.java +++ b/java/com/google/gerrit/server/mail/send/MergedSender.java @@ -16,10 +16,10 @@ package com.google.gerrit.server.mail.send; import com.google.common.collect.HashBasedTable; import com.google.common.collect.Table; -import com.google.gerrit.common.data.LabelType; -import com.google.gerrit.common.data.LabelTypes; import com.google.gerrit.entities.Account; import com.google.gerrit.entities.Change; +import com.google.gerrit.entities.LabelType; +import com.google.gerrit.entities.LabelTypes; import com.google.gerrit.entities.LabelValue; import com.google.gerrit.entities.NotifyConfig.NotifyType; import com.google.gerrit.entities.PatchSetApproval; diff --git a/java/com/google/gerrit/server/notedb/ChangeNotes.java b/java/com/google/gerrit/server/notedb/ChangeNotes.java index cf854c7118..00e4765f3c 100644 --- a/java/com/google/gerrit/server/notedb/ChangeNotes.java +++ b/java/com/google/gerrit/server/notedb/ChangeNotes.java @@ -38,7 +38,6 @@ import com.google.common.collect.Sets; import com.google.common.collect.Sets.SetView; import com.google.common.flogger.FluentLogger; import com.google.gerrit.common.Nullable; -import com.google.gerrit.common.data.SubmitRecord; import com.google.gerrit.entities.Account; import com.google.gerrit.entities.AttentionSetUpdate; import com.google.gerrit.entities.BranchNameKey; @@ -51,6 +50,7 @@ import com.google.gerrit.entities.PatchSetApproval; import com.google.gerrit.entities.Project; import com.google.gerrit.entities.RefNames; import com.google.gerrit.entities.RobotComment; +import com.google.gerrit.entities.SubmitRecord; import com.google.gerrit.exceptions.StorageException; import com.google.gerrit.server.AssigneeStatusUpdate; import com.google.gerrit.server.ReviewerByEmailSet; diff --git a/java/com/google/gerrit/server/notedb/ChangeNotesParser.java b/java/com/google/gerrit/server/notedb/ChangeNotesParser.java index 10a8d8b2ae..c92d2368cb 100644 --- a/java/com/google/gerrit/server/notedb/ChangeNotesParser.java +++ b/java/com/google/gerrit/server/notedb/ChangeNotesParser.java @@ -55,8 +55,6 @@ import com.google.common.collect.Table; import com.google.common.collect.Tables; import com.google.common.flogger.FluentLogger; import com.google.common.primitives.Ints; -import com.google.gerrit.common.data.LabelType; -import com.google.gerrit.common.data.SubmitRecord; import com.google.gerrit.entities.Account; import com.google.gerrit.entities.Address; import com.google.gerrit.entities.AttentionSetUpdate; @@ -64,9 +62,11 @@ import com.google.gerrit.entities.Change; import com.google.gerrit.entities.ChangeMessage; import com.google.gerrit.entities.HumanComment; import com.google.gerrit.entities.LabelId; +import com.google.gerrit.entities.LabelType; import com.google.gerrit.entities.PatchSet; import com.google.gerrit.entities.PatchSetApproval; import com.google.gerrit.entities.RefNames; +import com.google.gerrit.entities.SubmitRecord; import com.google.gerrit.metrics.Timer0; import com.google.gerrit.server.AssigneeStatusUpdate; import com.google.gerrit.server.ReviewerByEmailSet; diff --git a/java/com/google/gerrit/server/notedb/ChangeNotesState.java b/java/com/google/gerrit/server/notedb/ChangeNotesState.java index 0b03a0777b..76c4678ead 100644 --- a/java/com/google/gerrit/server/notedb/ChangeNotesState.java +++ b/java/com/google/gerrit/server/notedb/ChangeNotesState.java @@ -33,7 +33,6 @@ import com.google.common.collect.ListMultimap; import com.google.common.collect.Maps; import com.google.common.collect.Table; import com.google.gerrit.common.Nullable; -import com.google.gerrit.common.data.SubmitRecord; import com.google.gerrit.entities.Account; import com.google.gerrit.entities.Address; import com.google.gerrit.entities.AttentionSetUpdate; @@ -44,6 +43,7 @@ import com.google.gerrit.entities.HumanComment; import com.google.gerrit.entities.PatchSet; import com.google.gerrit.entities.PatchSetApproval; import com.google.gerrit.entities.Project; +import com.google.gerrit.entities.SubmitRecord; import com.google.gerrit.entities.converter.ChangeMessageProtoConverter; import com.google.gerrit.entities.converter.PatchSetApprovalProtoConverter; import com.google.gerrit.entities.converter.PatchSetProtoConverter; diff --git a/java/com/google/gerrit/server/notedb/ChangeUpdate.java b/java/com/google/gerrit/server/notedb/ChangeUpdate.java index 19561549f9..fbc7d7ea01 100644 --- a/java/com/google/gerrit/server/notedb/ChangeUpdate.java +++ b/java/com/google/gerrit/server/notedb/ChangeUpdate.java @@ -53,7 +53,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Table; import com.google.common.collect.TreeBasedTable; -import com.google.gerrit.common.data.SubmitRecord; import com.google.gerrit.entities.Account; import com.google.gerrit.entities.Address; import com.google.gerrit.entities.AttentionSetUpdate; @@ -63,6 +62,7 @@ import com.google.gerrit.entities.HumanComment; import com.google.gerrit.entities.Project; import com.google.gerrit.entities.RobotComment; import com.google.gerrit.entities.SubmissionId; +import com.google.gerrit.entities.SubmitRecord; import com.google.gerrit.exceptions.StorageException; import com.google.gerrit.server.CurrentUser; import com.google.gerrit.server.GerritPersonIdent; diff --git a/java/com/google/gerrit/server/permissions/ChangeControl.java b/java/com/google/gerrit/server/permissions/ChangeControl.java index 9f216c08a6..0b4828b232 100644 --- a/java/com/google/gerrit/server/permissions/ChangeControl.java +++ b/java/com/google/gerrit/server/permissions/ChangeControl.java @@ -19,10 +19,10 @@ import static com.google.gerrit.server.permissions.LabelPermission.ForUser.ON_BE import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import com.google.gerrit.common.data.Permission; -import com.google.gerrit.common.data.PermissionRange; import com.google.gerrit.entities.Account; import com.google.gerrit.entities.Change; +import com.google.gerrit.entities.Permission; +import com.google.gerrit.entities.PermissionRange; import com.google.gerrit.exceptions.StorageException; import com.google.gerrit.extensions.conditions.BooleanCondition; import com.google.gerrit.extensions.restapi.AuthException; diff --git a/java/com/google/gerrit/server/permissions/DefaultPermissionBackend.java b/java/com/google/gerrit/server/permissions/DefaultPermissionBackend.java index cb0d48a3e1..cf6a1846ce 100644 --- a/java/com/google/gerrit/server/permissions/DefaultPermissionBackend.java +++ b/java/com/google/gerrit/server/permissions/DefaultPermissionBackend.java @@ -21,10 +21,10 @@ import static java.util.stream.Collectors.toSet; import com.google.common.collect.Sets; import com.google.common.flogger.FluentLogger; -import com.google.gerrit.common.data.PermissionRule; -import com.google.gerrit.common.data.PermissionRule.Action; import com.google.gerrit.entities.Account; import com.google.gerrit.entities.AccountGroup; +import com.google.gerrit.entities.PermissionRule; +import com.google.gerrit.entities.PermissionRule.Action; import com.google.gerrit.entities.Project; import com.google.gerrit.extensions.api.access.GlobalOrPluginPermission; import com.google.gerrit.extensions.api.access.PluginPermission; diff --git a/java/com/google/gerrit/server/permissions/DefaultPermissionMappings.java b/java/com/google/gerrit/server/permissions/DefaultPermissionMappings.java index 8479f02dce..dcaf48564f 100644 --- a/java/com/google/gerrit/server/permissions/DefaultPermissionMappings.java +++ b/java/com/google/gerrit/server/permissions/DefaultPermissionMappings.java @@ -20,7 +20,7 @@ import static java.util.Objects.requireNonNull; import com.google.common.collect.ImmutableBiMap; import com.google.common.collect.ImmutableMap; import com.google.gerrit.common.data.GlobalCapability; -import com.google.gerrit.common.data.Permission; +import com.google.gerrit.entities.Permission; import com.google.gerrit.extensions.api.access.GlobalOrPluginPermission; import com.google.gerrit.extensions.api.access.PluginPermission; import com.google.gerrit.extensions.api.access.PluginProjectPermission; diff --git a/java/com/google/gerrit/server/permissions/LabelPermission.java b/java/com/google/gerrit/server/permissions/LabelPermission.java index 64eecfe3bb..268570cfe2 100644 --- a/java/com/google/gerrit/server/permissions/LabelPermission.java +++ b/java/com/google/gerrit/server/permissions/LabelPermission.java @@ -18,7 +18,7 @@ import static com.google.gerrit.server.permissions.LabelPermission.ForUser.ON_BE import static com.google.gerrit.server.permissions.LabelPermission.ForUser.SELF; import static java.util.Objects.requireNonNull; -import com.google.gerrit.common.data.LabelType; +import com.google.gerrit.entities.LabelType; import com.google.gerrit.entities.LabelValue; import com.google.gerrit.server.util.LabelVote; diff --git a/java/com/google/gerrit/server/permissions/PermissionBackend.java b/java/com/google/gerrit/server/permissions/PermissionBackend.java index 23145baf0a..eceb9709ee 100644 --- a/java/com/google/gerrit/server/permissions/PermissionBackend.java +++ b/java/com/google/gerrit/server/permissions/PermissionBackend.java @@ -21,9 +21,9 @@ import com.google.auto.value.AutoValue; import com.google.common.collect.ImmutableList; import com.google.common.collect.Sets; import com.google.common.flogger.FluentLogger; -import com.google.gerrit.common.data.LabelType; import com.google.gerrit.entities.Account; import com.google.gerrit.entities.BranchNameKey; +import com.google.gerrit.entities.LabelType; import com.google.gerrit.entities.Project; import com.google.gerrit.exceptions.StorageException; import com.google.gerrit.extensions.api.access.CoreOrPluginProjectPermission; diff --git a/java/com/google/gerrit/server/permissions/PermissionCollection.java b/java/com/google/gerrit/server/permissions/PermissionCollection.java index 1f0370b74f..ddba52b248 100644 --- a/java/com/google/gerrit/server/permissions/PermissionCollection.java +++ b/java/com/google/gerrit/server/permissions/PermissionCollection.java @@ -14,7 +14,7 @@ package com.google.gerrit.server.permissions; -import static com.google.gerrit.common.data.PermissionRule.Action.BLOCK; +import static com.google.gerrit.entities.PermissionRule.Action.BLOCK; import static com.google.gerrit.server.project.RefPattern.containsParameters; import static com.google.gerrit.server.project.RefPattern.isRE; import static java.util.stream.Collectors.mapping; @@ -23,11 +23,11 @@ import static java.util.stream.Collectors.toList; import com.google.auto.value.AutoValue; import com.google.common.collect.Lists; import com.google.gerrit.common.Nullable; -import com.google.gerrit.common.data.AccessSection; -import com.google.gerrit.common.data.Permission; -import com.google.gerrit.common.data.PermissionRule; -import com.google.gerrit.common.data.PermissionRule.Action; +import com.google.gerrit.entities.AccessSection; import com.google.gerrit.entities.AccountGroup; +import com.google.gerrit.entities.Permission; +import com.google.gerrit.entities.PermissionRule; +import com.google.gerrit.entities.PermissionRule.Action; import com.google.gerrit.entities.Project; import com.google.gerrit.metrics.Description; import com.google.gerrit.metrics.Description.Units; diff --git a/java/com/google/gerrit/server/permissions/ProjectControl.java b/java/com/google/gerrit/server/permissions/ProjectControl.java index e6d66ee4b2..724017dbf4 100644 --- a/java/com/google/gerrit/server/permissions/ProjectControl.java +++ b/java/com/google/gerrit/server/permissions/ProjectControl.java @@ -15,18 +15,18 @@ package com.google.gerrit.server.permissions; import static com.google.common.base.Preconditions.checkArgument; -import static com.google.gerrit.common.data.AccessSection.ALL; -import static com.google.gerrit.common.data.AccessSection.REGEX_PREFIX; +import static com.google.gerrit.entities.AccessSection.ALL; +import static com.google.gerrit.entities.AccessSection.REGEX_PREFIX; import static com.google.gerrit.entities.RefNames.REFS_TAGS; import static com.google.gerrit.server.util.MagicBranch.NEW_CHANGE; import com.google.common.collect.Sets; -import com.google.gerrit.common.data.AccessSection; -import com.google.gerrit.common.data.Permission; -import com.google.gerrit.common.data.PermissionRule; +import com.google.gerrit.entities.AccessSection; import com.google.gerrit.entities.AccountGroup; import com.google.gerrit.entities.BranchNameKey; import com.google.gerrit.entities.Change; +import com.google.gerrit.entities.Permission; +import com.google.gerrit.entities.PermissionRule; import com.google.gerrit.entities.Project; import com.google.gerrit.entities.RefNames; import com.google.gerrit.exceptions.StorageException; diff --git a/java/com/google/gerrit/server/permissions/RefControl.java b/java/com/google/gerrit/server/permissions/RefControl.java index 5081116798..bc802cc5a3 100644 --- a/java/com/google/gerrit/server/permissions/RefControl.java +++ b/java/com/google/gerrit/server/permissions/RefControl.java @@ -17,11 +17,11 @@ package com.google.gerrit.server.permissions; import static com.google.common.base.Preconditions.checkArgument; import com.google.common.flogger.FluentLogger; -import com.google.gerrit.common.data.Permission; -import com.google.gerrit.common.data.PermissionRange; -import com.google.gerrit.common.data.PermissionRule; -import com.google.gerrit.common.data.PermissionRule.Action; import com.google.gerrit.entities.Change; +import com.google.gerrit.entities.Permission; +import com.google.gerrit.entities.PermissionRange; +import com.google.gerrit.entities.PermissionRule; +import com.google.gerrit.entities.PermissionRule.Action; import com.google.gerrit.entities.Project; import com.google.gerrit.entities.RefNames; import com.google.gerrit.exceptions.StorageException; diff --git a/java/com/google/gerrit/server/permissions/SectionSortCache.java b/java/com/google/gerrit/server/permissions/SectionSortCache.java index 814a8d2cf3..6081e9a65a 100644 --- a/java/com/google/gerrit/server/permissions/SectionSortCache.java +++ b/java/com/google/gerrit/server/permissions/SectionSortCache.java @@ -18,7 +18,7 @@ import com.google.auto.value.AutoValue; import com.google.common.cache.Cache; import com.google.common.collect.ImmutableList; import com.google.common.flogger.FluentLogger; -import com.google.gerrit.common.data.AccessSection; +import com.google.gerrit.entities.AccessSection; import com.google.gerrit.server.cache.CacheModule; import com.google.gerrit.server.util.MostSpecificComparator; import com.google.inject.Inject; diff --git a/java/com/google/gerrit/server/project/ContributorAgreementsChecker.java b/java/com/google/gerrit/server/project/ContributorAgreementsChecker.java index 610ee64ff2..f054e849d5 100644 --- a/java/com/google/gerrit/server/project/ContributorAgreementsChecker.java +++ b/java/com/google/gerrit/server/project/ContributorAgreementsChecker.java @@ -17,12 +17,12 @@ package com.google.gerrit.server.project; import static com.google.common.base.Preconditions.checkArgument; import static java.util.Objects.requireNonNull; -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.entities.AccountGroup; import com.google.gerrit.entities.AccountGroup.UUID; import com.google.gerrit.entities.BooleanProjectConfig; +import com.google.gerrit.entities.ContributorAgreement; +import com.google.gerrit.entities.PermissionRule; +import com.google.gerrit.entities.PermissionRule.Action; import com.google.gerrit.entities.Project; import com.google.gerrit.extensions.registration.DynamicItem; import com.google.gerrit.extensions.restapi.AuthException; diff --git a/java/com/google/gerrit/server/project/LabelDefinitionJson.java b/java/com/google/gerrit/server/project/LabelDefinitionJson.java index 569cb54213..7aa4029d09 100644 --- a/java/com/google/gerrit/server/project/LabelDefinitionJson.java +++ b/java/com/google/gerrit/server/project/LabelDefinitionJson.java @@ -16,7 +16,7 @@ package com.google.gerrit.server.project; import static java.util.stream.Collectors.toMap; -import com.google.gerrit.common.data.LabelType; +import com.google.gerrit.entities.LabelType; import com.google.gerrit.entities.LabelValue; import com.google.gerrit.entities.Project; import com.google.gerrit.extensions.common.LabelDefinitionInfo; diff --git a/java/com/google/gerrit/server/project/LabelResource.java b/java/com/google/gerrit/server/project/LabelResource.java index a7a2f07e7b..2df9ff1d41 100644 --- a/java/com/google/gerrit/server/project/LabelResource.java +++ b/java/com/google/gerrit/server/project/LabelResource.java @@ -14,7 +14,7 @@ package com.google.gerrit.server.project; -import com.google.gerrit.common.data.LabelType; +import com.google.gerrit.entities.LabelType; import com.google.gerrit.extensions.restapi.RestResource; import com.google.gerrit.extensions.restapi.RestView; import com.google.inject.TypeLiteral; diff --git a/java/com/google/gerrit/server/project/ProjectConfig.java b/java/com/google/gerrit/server/project/ProjectConfig.java index 0c69722d23..00cd1caafe 100644 --- a/java/com/google/gerrit/server/project/ProjectConfig.java +++ b/java/com/google/gerrit/server/project/ProjectConfig.java @@ -17,7 +17,7 @@ package com.google.gerrit.server.project; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkState; import static com.google.common.collect.ImmutableList.toImmutableList; -import static com.google.gerrit.common.data.Permission.isPermission; +import static com.google.gerrit.entities.Permission.isPermission; import static com.google.gerrit.entities.Project.DEFAULT_SUBMIT_TYPE; import static com.google.gerrit.server.permissions.PluginPermissionsUtil.isValidPluginPermission; import static java.util.Objects.requireNonNull; @@ -28,34 +28,35 @@ import com.google.common.base.Joiner; import com.google.common.base.Splitter; import com.google.common.base.Strings; import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; import com.google.common.collect.Sets; import com.google.common.primitives.Shorts; import com.google.gerrit.common.Nullable; import com.google.gerrit.common.UsedAt; -import com.google.gerrit.common.data.AccessSection; -import com.google.gerrit.common.data.ContributorAgreement; import com.google.gerrit.common.data.GlobalCapability; -import com.google.gerrit.common.data.LabelFunction; -import com.google.gerrit.common.data.LabelType; -import com.google.gerrit.common.data.Permission; -import com.google.gerrit.common.data.PermissionRule; -import com.google.gerrit.common.data.PermissionRule.Action; -import com.google.gerrit.common.data.SubscribeSection; +import com.google.gerrit.entities.AccessSection; import com.google.gerrit.entities.AccountGroup; +import com.google.gerrit.entities.AccountsSection; import com.google.gerrit.entities.Address; import com.google.gerrit.entities.BooleanProjectConfig; import com.google.gerrit.entities.BranchOrderSection; +import com.google.gerrit.entities.CachedProjectConfig; import com.google.gerrit.entities.ConfiguredMimeTypes; +import com.google.gerrit.entities.ContributorAgreement; import com.google.gerrit.entities.GroupDescription; import com.google.gerrit.entities.GroupReference; +import com.google.gerrit.entities.LabelFunction; +import com.google.gerrit.entities.LabelType; import com.google.gerrit.entities.LabelValue; import com.google.gerrit.entities.NotifyConfig; import com.google.gerrit.entities.NotifyConfig.NotifyType; +import com.google.gerrit.entities.Permission; +import com.google.gerrit.entities.PermissionRule; +import com.google.gerrit.entities.PermissionRule.Action; import com.google.gerrit.entities.Project; import com.google.gerrit.entities.RefNames; import com.google.gerrit.entities.StoredCommentLinkInfo; +import com.google.gerrit.entities.SubscribeSection; import com.google.gerrit.exceptions.InvalidNameException; import com.google.gerrit.extensions.client.InheritableBoolean; import com.google.gerrit.extensions.client.ProjectState; @@ -256,24 +257,27 @@ public class ProjectConfig extends VersionedMetaData implements ValidationError. /** Returns an immutable, thread-safe representation of this object that can be cached. */ public CachedProjectConfig getCacheable() { - return CachedProjectConfig.builder() - .setProject(project) - .setAccountsSection(accountsSection) - .setGroups(ImmutableMap.copyOf(groupList.byUUID())) - .setAccessSections(ImmutableMap.copyOf(accessSections)) - .setBranchOrderSection(Optional.ofNullable(branchOrderSection)) - .setContributorAgreements(ImmutableMap.copyOf(contributorAgreements)) - .setNotifySections(ImmutableMap.copyOf(notifySections)) - .setLabelSections(ImmutableMap.copyOf(labelSections)) - .setMimeTypes(mimeTypes) - .setSubscribeSections(ImmutableMap.copyOf(subscribeSections)) - .setCommentLinkSections(ImmutableMap.copyOf(commentLinkSections)) - .setRulesId(Optional.ofNullable(rulesId)) - .setRevision(Optional.ofNullable(getRevision())) - .setMaxObjectSizeLimit(maxObjectSizeLimit) - .setCheckReceivedObjects(checkReceivedObjects) - .setExtensionPanelSections(extensionPanelSections) - .build(); + CachedProjectConfig.Builder builder = + CachedProjectConfig.builder() + .setProject(project) + .setAccountsSection(accountsSection) + .setBranchOrderSection(Optional.ofNullable(branchOrderSection)) + .setMimeTypes(mimeTypes) + .setRulesId(Optional.ofNullable(rulesId)) + .setRevision(Optional.ofNullable(getRevision())) + .setMaxObjectSizeLimit(maxObjectSizeLimit) + .setCheckReceivedObjects(checkReceivedObjects) + .setExtensionPanelSections(extensionPanelSections); + + groupList.byUUID().values().forEach(g -> builder.addGroup(g)); + accessSections.values().forEach(a -> builder.addAccessSection(a)); + contributorAgreements.values().forEach(c -> builder.addContributorAgreement(c)); + notifySections.values().forEach(n -> builder.addNotifySection(n)); + subscribeSections.values().forEach(s -> builder.addSubscribeSection(s)); + commentLinkSections.values().forEach(c -> builder.addCommentLinkSection(c)); + labelSections.values().forEach(l -> builder.addLabelSection(l)); + + return builder.build(); } public static StoredCommentLinkInfo buildCommentLink(Config cfg, String name, boolean allowRaw) diff --git a/java/com/google/gerrit/server/project/ProjectCreator.java b/java/com/google/gerrit/server/project/ProjectCreator.java index 19c3afb310..c382f045c8 100644 --- a/java/com/google/gerrit/server/project/ProjectCreator.java +++ b/java/com/google/gerrit/server/project/ProjectCreator.java @@ -19,13 +19,13 @@ import static com.google.gerrit.server.project.ProjectCache.illegalState; import com.google.common.base.MoreObjects; import com.google.common.base.Strings; import com.google.common.flogger.FluentLogger; -import com.google.gerrit.common.data.AccessSection; -import com.google.gerrit.common.data.Permission; -import com.google.gerrit.common.data.PermissionRule; +import com.google.gerrit.entities.AccessSection; import com.google.gerrit.entities.AccountGroup; import com.google.gerrit.entities.BooleanProjectConfig; import com.google.gerrit.entities.GroupDescription; import com.google.gerrit.entities.GroupReference; +import com.google.gerrit.entities.Permission; +import com.google.gerrit.entities.PermissionRule; import com.google.gerrit.entities.Project; import com.google.gerrit.entities.RefNames; import com.google.gerrit.extensions.events.NewProjectCreatedListener; diff --git a/java/com/google/gerrit/server/project/ProjectJson.java b/java/com/google/gerrit/server/project/ProjectJson.java index de55a12c88..4eda1ccbe4 100644 --- a/java/com/google/gerrit/server/project/ProjectJson.java +++ b/java/com/google/gerrit/server/project/ProjectJson.java @@ -19,7 +19,7 @@ import static java.util.stream.Collectors.toMap; import com.google.common.base.Strings; import com.google.common.collect.ImmutableList; import com.google.common.flogger.FluentLogger; -import com.google.gerrit.common.data.LabelType; +import com.google.gerrit.entities.LabelType; import com.google.gerrit.entities.LabelValue; import com.google.gerrit.entities.Project; import com.google.gerrit.extensions.common.LabelTypeInfo; diff --git a/java/com/google/gerrit/server/project/ProjectState.java b/java/com/google/gerrit/server/project/ProjectState.java index 42e09d3e18..0b11512bce 100644 --- a/java/com/google/gerrit/server/project/ProjectState.java +++ b/java/com/google/gerrit/server/project/ProjectState.java @@ -14,26 +14,27 @@ package com.google.gerrit.server.project; -import static com.google.gerrit.common.data.PermissionRule.Action.ALLOW; +import static com.google.gerrit.entities.PermissionRule.Action.ALLOW; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; import com.google.common.flogger.FluentLogger; -import com.google.gerrit.common.data.AccessSection; -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.PermissionRule; -import com.google.gerrit.common.data.SubscribeSection; +import com.google.gerrit.entities.AccessSection; import com.google.gerrit.entities.AccountGroup; import com.google.gerrit.entities.BooleanProjectConfig; import com.google.gerrit.entities.BranchNameKey; import com.google.gerrit.entities.BranchOrderSection; +import com.google.gerrit.entities.CachedProjectConfig; import com.google.gerrit.entities.GroupReference; +import com.google.gerrit.entities.LabelType; +import com.google.gerrit.entities.LabelTypes; +import com.google.gerrit.entities.Permission; +import com.google.gerrit.entities.PermissionRule; import com.google.gerrit.entities.Project; import com.google.gerrit.entities.StoredCommentLinkInfo; +import com.google.gerrit.entities.SubscribeSection; import com.google.gerrit.extensions.api.projects.CommentLinkInfo; import com.google.gerrit.extensions.client.SubmitType; import com.google.gerrit.extensions.restapi.ResourceConflictException; diff --git a/java/com/google/gerrit/server/project/RefPattern.java b/java/com/google/gerrit/server/project/RefPattern.java index c52914b667..5bac950a04 100644 --- a/java/com/google/gerrit/server/project/RefPattern.java +++ b/java/com/google/gerrit/server/project/RefPattern.java @@ -19,8 +19,8 @@ import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; import com.google.common.collect.ImmutableMap; -import com.google.gerrit.common.data.AccessSection; import com.google.gerrit.common.data.ParameterizedString; +import com.google.gerrit.entities.AccessSection; import com.google.gerrit.exceptions.InvalidNameException; import dk.brics.automaton.RegExp; import java.util.Map; diff --git a/java/com/google/gerrit/server/project/SectionMatcher.java b/java/com/google/gerrit/server/project/SectionMatcher.java index 6de8eec3f6..763957e03e 100644 --- a/java/com/google/gerrit/server/project/SectionMatcher.java +++ b/java/com/google/gerrit/server/project/SectionMatcher.java @@ -14,7 +14,7 @@ package com.google.gerrit.server.project; -import com.google.gerrit.common.data.AccessSection; +import com.google.gerrit.entities.AccessSection; import com.google.gerrit.entities.Project; import com.google.gerrit.server.CurrentUser; diff --git a/java/com/google/gerrit/server/project/SubmitRuleEvaluator.java b/java/com/google/gerrit/server/project/SubmitRuleEvaluator.java index cf3819d7a4..0e50bb0f94 100644 --- a/java/com/google/gerrit/server/project/SubmitRuleEvaluator.java +++ b/java/com/google/gerrit/server/project/SubmitRuleEvaluator.java @@ -18,9 +18,9 @@ import static com.google.gerrit.server.project.ProjectCache.noSuchProject; import com.google.common.collect.Streams; import com.google.common.flogger.FluentLogger; -import com.google.gerrit.common.data.SubmitRecord; -import com.google.gerrit.common.data.SubmitTypeRecord; import com.google.gerrit.entities.Change; +import com.google.gerrit.entities.SubmitRecord; +import com.google.gerrit.entities.SubmitTypeRecord; import com.google.gerrit.exceptions.StorageException; import com.google.gerrit.metrics.Description; import com.google.gerrit.metrics.Description.Units; diff --git a/java/com/google/gerrit/server/project/testing/TestLabels.java b/java/com/google/gerrit/server/project/testing/TestLabels.java index 8629757c54..157c7460b8 100644 --- a/java/com/google/gerrit/server/project/testing/TestLabels.java +++ b/java/com/google/gerrit/server/project/testing/TestLabels.java @@ -14,8 +14,8 @@ package com.google.gerrit.server.project.testing; -import com.google.gerrit.common.data.LabelFunction; -import com.google.gerrit.common.data.LabelType; +import com.google.gerrit.entities.LabelFunction; +import com.google.gerrit.entities.LabelType; import com.google.gerrit.entities.LabelValue; import java.util.Arrays; diff --git a/java/com/google/gerrit/server/query/change/ChangeData.java b/java/com/google/gerrit/server/query/change/ChangeData.java index 34c96dd17f..7f7df8ca89 100644 --- a/java/com/google/gerrit/server/query/change/ChangeData.java +++ b/java/com/google/gerrit/server/query/change/ChangeData.java @@ -33,20 +33,20 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.primitives.Ints; import com.google.gerrit.common.Nullable; -import com.google.gerrit.common.data.LabelTypes; -import com.google.gerrit.common.data.SubmitRecord; -import com.google.gerrit.common.data.SubmitTypeRecord; import com.google.gerrit.entities.Account; import com.google.gerrit.entities.AttentionSetUpdate; import com.google.gerrit.entities.Change; import com.google.gerrit.entities.ChangeMessage; import com.google.gerrit.entities.Comment; import com.google.gerrit.entities.HumanComment; +import com.google.gerrit.entities.LabelTypes; import com.google.gerrit.entities.PatchSet; import com.google.gerrit.entities.PatchSetApproval; import com.google.gerrit.entities.Project; import com.google.gerrit.entities.RefNames; import com.google.gerrit.entities.RobotComment; +import com.google.gerrit.entities.SubmitRecord; +import com.google.gerrit.entities.SubmitTypeRecord; import com.google.gerrit.exceptions.StorageException; import com.google.gerrit.extensions.restapi.BadRequestException; import com.google.gerrit.extensions.restapi.ResourceConflictException; diff --git a/java/com/google/gerrit/server/query/change/ChangeQueryBuilder.java b/java/com/google/gerrit/server/query/change/ChangeQueryBuilder.java index 2681b6d7c0..c9ae126912 100644 --- a/java/com/google/gerrit/server/query/change/ChangeQueryBuilder.java +++ b/java/com/google/gerrit/server/query/change/ChangeQueryBuilder.java @@ -28,7 +28,6 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.flogger.FluentLogger; import com.google.common.primitives.Ints; -import com.google.gerrit.common.data.SubmitRecord; import com.google.gerrit.entities.Account; import com.google.gerrit.entities.AccountGroup; import com.google.gerrit.entities.Address; @@ -38,6 +37,7 @@ import com.google.gerrit.entities.GroupDescription; import com.google.gerrit.entities.GroupReference; import com.google.gerrit.entities.PatchSet; import com.google.gerrit.entities.RefNames; +import com.google.gerrit.entities.SubmitRecord; import com.google.gerrit.exceptions.NotSignedInException; import com.google.gerrit.exceptions.StorageException; import com.google.gerrit.extensions.registration.DynamicMap; diff --git a/java/com/google/gerrit/server/query/change/ConflictsPredicate.java b/java/com/google/gerrit/server/query/change/ConflictsPredicate.java index 6eb6871dad..16f85b191d 100644 --- a/java/com/google/gerrit/server/query/change/ConflictsPredicate.java +++ b/java/com/google/gerrit/server/query/change/ConflictsPredicate.java @@ -20,11 +20,11 @@ import static com.google.gerrit.server.project.ProjectCache.noSuchProject; import static java.util.concurrent.TimeUnit.MINUTES; import com.google.common.flogger.FluentLogger; -import com.google.gerrit.common.data.SubmitTypeRecord; import com.google.gerrit.entities.BooleanProjectConfig; import com.google.gerrit.entities.BranchNameKey; import com.google.gerrit.entities.Change; import com.google.gerrit.entities.Project; +import com.google.gerrit.entities.SubmitTypeRecord; import com.google.gerrit.exceptions.StorageException; import com.google.gerrit.index.query.PostFilterPredicate; import com.google.gerrit.index.query.Predicate; diff --git a/java/com/google/gerrit/server/query/change/EqualsLabelPredicate.java b/java/com/google/gerrit/server/query/change/EqualsLabelPredicate.java index 569d7cbe54..4b6c96447a 100644 --- a/java/com/google/gerrit/server/query/change/EqualsLabelPredicate.java +++ b/java/com/google/gerrit/server/query/change/EqualsLabelPredicate.java @@ -14,11 +14,11 @@ package com.google.gerrit.server.query.change; -import com.google.gerrit.common.data.LabelType; -import com.google.gerrit.common.data.LabelTypes; import com.google.gerrit.entities.Account; import com.google.gerrit.entities.AccountGroup; import com.google.gerrit.entities.Change; +import com.google.gerrit.entities.LabelType; +import com.google.gerrit.entities.LabelTypes; import com.google.gerrit.entities.PatchSetApproval; import com.google.gerrit.extensions.restapi.AuthException; import com.google.gerrit.server.IdentifiedUser; diff --git a/java/com/google/gerrit/server/query/change/OutputStreamQuery.java b/java/com/google/gerrit/server/query/change/OutputStreamQuery.java index e8754995d5..02e8434fe0 100644 --- a/java/com/google/gerrit/server/query/change/OutputStreamQuery.java +++ b/java/com/google/gerrit/server/query/change/OutputStreamQuery.java @@ -18,7 +18,7 @@ import static com.google.common.base.Preconditions.checkState; import static java.nio.charset.StandardCharsets.UTF_8; import com.google.common.flogger.FluentLogger; -import com.google.gerrit.common.data.LabelTypes; +import com.google.gerrit.entities.LabelTypes; import com.google.gerrit.entities.PatchSet; import com.google.gerrit.entities.Project; import com.google.gerrit.exceptions.StorageException; diff --git a/java/com/google/gerrit/server/query/change/SubmitRecordPredicate.java b/java/com/google/gerrit/server/query/change/SubmitRecordPredicate.java index bc65422f27..4ca684ad4e 100644 --- a/java/com/google/gerrit/server/query/change/SubmitRecordPredicate.java +++ b/java/com/google/gerrit/server/query/change/SubmitRecordPredicate.java @@ -16,8 +16,8 @@ package com.google.gerrit.server.query.change; import static java.util.stream.Collectors.toList; -import com.google.gerrit.common.data.SubmitRecord; import com.google.gerrit.entities.Account; +import com.google.gerrit.entities.SubmitRecord; import com.google.gerrit.index.query.Predicate; import com.google.gerrit.server.index.change.ChangeField; import java.util.Set; diff --git a/java/com/google/gerrit/server/query/change/SubmittablePredicate.java b/java/com/google/gerrit/server/query/change/SubmittablePredicate.java index c507f1cd65..2018fbcca6 100644 --- a/java/com/google/gerrit/server/query/change/SubmittablePredicate.java +++ b/java/com/google/gerrit/server/query/change/SubmittablePredicate.java @@ -14,7 +14,7 @@ package com.google.gerrit.server.query.change; -import com.google.gerrit.common.data.SubmitRecord; +import com.google.gerrit.entities.SubmitRecord; import com.google.gerrit.server.index.change.ChangeField; public class SubmittablePredicate extends ChangeIndexPredicate { diff --git a/java/com/google/gerrit/server/restapi/account/GetAgreements.java b/java/com/google/gerrit/server/restapi/account/GetAgreements.java index c11fc7ed28..db6ad48879 100644 --- a/java/com/google/gerrit/server/restapi/account/GetAgreements.java +++ b/java/com/google/gerrit/server/restapi/account/GetAgreements.java @@ -15,10 +15,10 @@ package com.google.gerrit.server.restapi.account; import com.google.common.flogger.FluentLogger; -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.entities.AccountGroup; +import com.google.gerrit.entities.ContributorAgreement; +import com.google.gerrit.entities.PermissionRule; +import com.google.gerrit.entities.PermissionRule.Action; import com.google.gerrit.extensions.common.AgreementInfo; import com.google.gerrit.extensions.restapi.AuthException; import com.google.gerrit.extensions.restapi.MethodNotAllowedException; diff --git a/java/com/google/gerrit/server/restapi/account/GetCapabilities.java b/java/com/google/gerrit/server/restapi/account/GetCapabilities.java index f3d95572b2..6ab2c4418a 100644 --- a/java/com/google/gerrit/server/restapi/account/GetCapabilities.java +++ b/java/com/google/gerrit/server/restapi/account/GetCapabilities.java @@ -21,7 +21,7 @@ import static com.google.gerrit.server.permissions.DefaultPermissionMappings.plu import com.google.common.collect.Iterables; import com.google.gerrit.common.data.GlobalCapability; -import com.google.gerrit.common.data.PermissionRange; +import com.google.gerrit.entities.PermissionRange; import com.google.gerrit.extensions.api.access.GlobalOrPluginPermission; import com.google.gerrit.extensions.api.access.PluginPermission; import com.google.gerrit.extensions.config.CapabilityDefinition; diff --git a/java/com/google/gerrit/server/restapi/account/PutAgreement.java b/java/com/google/gerrit/server/restapi/account/PutAgreement.java index ce6f287951..47c223c664 100644 --- a/java/com/google/gerrit/server/restapi/account/PutAgreement.java +++ b/java/com/google/gerrit/server/restapi/account/PutAgreement.java @@ -16,8 +16,8 @@ package com.google.gerrit.server.restapi.account; import com.google.common.base.Strings; import com.google.common.collect.ImmutableSet; -import com.google.gerrit.common.data.ContributorAgreement; import com.google.gerrit.entities.AccountGroup; +import com.google.gerrit.entities.ContributorAgreement; import com.google.gerrit.exceptions.NoSuchGroupException; import com.google.gerrit.extensions.api.accounts.AgreementInput; import com.google.gerrit.extensions.restapi.AuthException; diff --git a/java/com/google/gerrit/server/restapi/change/DeleteVote.java b/java/com/google/gerrit/server/restapi/change/DeleteVote.java index f88be815f7..4b813df7e6 100644 --- a/java/com/google/gerrit/server/restapi/change/DeleteVote.java +++ b/java/com/google/gerrit/server/restapi/change/DeleteVote.java @@ -19,10 +19,10 @@ import static com.google.gerrit.server.project.ProjectCache.illegalState; import static java.util.Objects.requireNonNull; import com.google.common.flogger.FluentLogger; -import com.google.gerrit.common.data.LabelTypes; import com.google.gerrit.entities.Account; import com.google.gerrit.entities.Change; import com.google.gerrit.entities.ChangeMessage; +import com.google.gerrit.entities.LabelTypes; import com.google.gerrit.entities.PatchSet; import com.google.gerrit.entities.PatchSetApproval; import com.google.gerrit.extensions.api.changes.DeleteVoteInput; diff --git a/java/com/google/gerrit/server/restapi/change/Mergeable.java b/java/com/google/gerrit/server/restapi/change/Mergeable.java index 5d656631f6..7683ab78f6 100644 --- a/java/com/google/gerrit/server/restapi/change/Mergeable.java +++ b/java/com/google/gerrit/server/restapi/change/Mergeable.java @@ -16,10 +16,10 @@ package com.google.gerrit.server.restapi.change; import static com.google.gerrit.server.project.ProjectCache.illegalState; -import com.google.gerrit.common.data.SubmitTypeRecord; import com.google.gerrit.entities.BranchOrderSection; import com.google.gerrit.entities.Change; import com.google.gerrit.entities.PatchSet; +import com.google.gerrit.entities.SubmitTypeRecord; import com.google.gerrit.extensions.client.SubmitType; import com.google.gerrit.extensions.common.MergeableInfo; import com.google.gerrit.extensions.restapi.AuthException; diff --git a/java/com/google/gerrit/server/restapi/change/Move.java b/java/com/google/gerrit/server/restapi/change/Move.java index c109cbf3fb..577174f184 100644 --- a/java/com/google/gerrit/server/restapi/change/Move.java +++ b/java/com/google/gerrit/server/restapi/change/Move.java @@ -23,10 +23,10 @@ import static com.google.gerrit.server.query.change.ChangeData.asChanges; import com.google.common.base.Strings; import com.google.common.flogger.FluentLogger; import com.google.gerrit.common.Nullable; -import com.google.gerrit.common.data.LabelType; import com.google.gerrit.entities.BranchNameKey; import com.google.gerrit.entities.Change; import com.google.gerrit.entities.ChangeMessage; +import com.google.gerrit.entities.LabelType; import com.google.gerrit.entities.PatchSet; import com.google.gerrit.entities.PatchSetApproval; import com.google.gerrit.entities.Project; diff --git a/java/com/google/gerrit/server/restapi/change/PostReview.java b/java/com/google/gerrit/server/restapi/change/PostReview.java index 902986cd13..e9fd99debc 100644 --- a/java/com/google/gerrit/server/restapi/change/PostReview.java +++ b/java/com/google/gerrit/server/restapi/change/PostReview.java @@ -41,8 +41,6 @@ import com.google.common.flogger.FluentLogger; import com.google.common.hash.HashCode; import com.google.common.hash.Hashing; import com.google.gerrit.common.Nullable; -import com.google.gerrit.common.data.LabelType; -import com.google.gerrit.common.data.LabelTypes; import com.google.gerrit.entities.Account; import com.google.gerrit.entities.Address; import com.google.gerrit.entities.Change; @@ -51,6 +49,8 @@ import com.google.gerrit.entities.Comment; import com.google.gerrit.entities.FixReplacement; import com.google.gerrit.entities.FixSuggestion; import com.google.gerrit.entities.HumanComment; +import com.google.gerrit.entities.LabelType; +import com.google.gerrit.entities.LabelTypes; import com.google.gerrit.entities.Patch; import com.google.gerrit.entities.PatchSet; import com.google.gerrit.entities.PatchSetApproval; diff --git a/java/com/google/gerrit/server/restapi/change/TestSubmitRule.java b/java/com/google/gerrit/server/restapi/change/TestSubmitRule.java index e0398c7181..02c2ff0280 100644 --- a/java/com/google/gerrit/server/restapi/change/TestSubmitRule.java +++ b/java/com/google/gerrit/server/restapi/change/TestSubmitRule.java @@ -15,7 +15,7 @@ package com.google.gerrit.server.restapi.change; import com.google.common.base.MoreObjects; -import com.google.gerrit.common.data.SubmitRecord; +import com.google.gerrit.entities.SubmitRecord; import com.google.gerrit.extensions.common.AccountInfo; import com.google.gerrit.extensions.common.TestSubmitRuleInfo; import com.google.gerrit.extensions.common.TestSubmitRuleInput; diff --git a/java/com/google/gerrit/server/restapi/change/TestSubmitType.java b/java/com/google/gerrit/server/restapi/change/TestSubmitType.java index cb52fcba3c..ecb455ef9b 100644 --- a/java/com/google/gerrit/server/restapi/change/TestSubmitType.java +++ b/java/com/google/gerrit/server/restapi/change/TestSubmitType.java @@ -15,7 +15,7 @@ package com.google.gerrit.server.restapi.change; import com.google.common.base.MoreObjects; -import com.google.gerrit.common.data.SubmitTypeRecord; +import com.google.gerrit.entities.SubmitTypeRecord; import com.google.gerrit.extensions.client.SubmitType; import com.google.gerrit.extensions.common.TestSubmitRuleInput; import com.google.gerrit.extensions.common.TestSubmitRuleInput.Filters; diff --git a/java/com/google/gerrit/server/restapi/config/AgreementJson.java b/java/com/google/gerrit/server/restapi/config/AgreementJson.java index e1e8e96b03..92dd489602 100644 --- a/java/com/google/gerrit/server/restapi/config/AgreementJson.java +++ b/java/com/google/gerrit/server/restapi/config/AgreementJson.java @@ -15,7 +15,7 @@ package com.google.gerrit.server.restapi.config; import com.google.common.flogger.FluentLogger; -import com.google.gerrit.common.data.ContributorAgreement; +import com.google.gerrit.entities.ContributorAgreement; import com.google.gerrit.entities.GroupReference; import com.google.gerrit.exceptions.NoSuchGroupException; import com.google.gerrit.exceptions.StorageException; diff --git a/java/com/google/gerrit/server/restapi/config/GetServerInfo.java b/java/com/google/gerrit/server/restapi/config/GetServerInfo.java index beb7dfd212..d08ee50f86 100644 --- a/java/com/google/gerrit/server/restapi/config/GetServerInfo.java +++ b/java/com/google/gerrit/server/restapi/config/GetServerInfo.java @@ -19,7 +19,7 @@ import static java.util.stream.Collectors.toList; import com.google.common.base.CharMatcher; import com.google.common.base.Strings; import com.google.common.collect.Lists; -import com.google.gerrit.common.data.ContributorAgreement; +import com.google.gerrit.entities.ContributorAgreement; import com.google.gerrit.extensions.common.AccountDefaultDisplayName; import com.google.gerrit.extensions.common.AccountsInfo; import com.google.gerrit.extensions.common.AuthInfo; diff --git a/java/com/google/gerrit/server/restapi/project/CreateAccessChange.java b/java/com/google/gerrit/server/restapi/project/CreateAccessChange.java index a87bbd1acb..eceab4334f 100644 --- a/java/com/google/gerrit/server/restapi/project/CreateAccessChange.java +++ b/java/com/google/gerrit/server/restapi/project/CreateAccessChange.java @@ -17,7 +17,7 @@ package com.google.gerrit.server.restapi.project; import static com.google.gerrit.server.project.ProjectCache.illegalState; import com.google.common.collect.ImmutableMap; -import com.google.gerrit.common.data.AccessSection; +import com.google.gerrit.entities.AccessSection; import com.google.gerrit.entities.Change; import com.google.gerrit.entities.PatchSet; import com.google.gerrit.entities.Project; diff --git a/java/com/google/gerrit/server/restapi/project/CreateLabel.java b/java/com/google/gerrit/server/restapi/project/CreateLabel.java index 416eeb3908..3e1ef49420 100644 --- a/java/com/google/gerrit/server/restapi/project/CreateLabel.java +++ b/java/com/google/gerrit/server/restapi/project/CreateLabel.java @@ -15,8 +15,8 @@ package com.google.gerrit.server.restapi.project; import com.google.common.base.Strings; -import com.google.gerrit.common.data.LabelFunction; -import com.google.gerrit.common.data.LabelType; +import com.google.gerrit.entities.LabelFunction; +import com.google.gerrit.entities.LabelType; import com.google.gerrit.entities.LabelValue; import com.google.gerrit.extensions.common.LabelDefinitionInfo; import com.google.gerrit.extensions.common.LabelDefinitionInput; diff --git a/java/com/google/gerrit/server/restapi/project/GetAccess.java b/java/com/google/gerrit/server/restapi/project/GetAccess.java index f60601ebce..b572db31d6 100644 --- a/java/com/google/gerrit/server/restapi/project/GetAccess.java +++ b/java/com/google/gerrit/server/restapi/project/GetAccess.java @@ -26,11 +26,11 @@ import static java.util.stream.Collectors.toMap; import com.google.common.collect.ImmutableBiMap; import com.google.common.collect.Iterables; import com.google.common.flogger.FluentLogger; -import com.google.gerrit.common.data.AccessSection; -import com.google.gerrit.common.data.Permission; -import com.google.gerrit.common.data.PermissionRule; +import com.google.gerrit.entities.AccessSection; import com.google.gerrit.entities.AccountGroup; import com.google.gerrit.entities.GroupDescription; +import com.google.gerrit.entities.Permission; +import com.google.gerrit.entities.PermissionRule; import com.google.gerrit.entities.Project; import com.google.gerrit.entities.RefNames; import com.google.gerrit.extensions.api.access.AccessSectionInfo; diff --git a/java/com/google/gerrit/server/restapi/project/LabelDefinitionInputParser.java b/java/com/google/gerrit/server/restapi/project/LabelDefinitionInputParser.java index 82e34eb4f8..0f49e63ac6 100644 --- a/java/com/google/gerrit/server/restapi/project/LabelDefinitionInputParser.java +++ b/java/com/google/gerrit/server/restapi/project/LabelDefinitionInputParser.java @@ -16,10 +16,10 @@ package com.google.gerrit.server.restapi.project; import com.google.common.collect.ImmutableList; import com.google.common.primitives.Shorts; -import com.google.gerrit.common.data.LabelFunction; -import com.google.gerrit.common.data.LabelType; -import com.google.gerrit.common.data.PermissionRule; +import com.google.gerrit.entities.LabelFunction; +import com.google.gerrit.entities.LabelType; import com.google.gerrit.entities.LabelValue; +import com.google.gerrit.entities.PermissionRule; import com.google.gerrit.entities.RefNames; import com.google.gerrit.exceptions.InvalidNameException; import com.google.gerrit.extensions.restapi.BadRequestException; diff --git a/java/com/google/gerrit/server/restapi/project/LabelsCollection.java b/java/com/google/gerrit/server/restapi/project/LabelsCollection.java index 04097293f0..54179e5e15 100644 --- a/java/com/google/gerrit/server/restapi/project/LabelsCollection.java +++ b/java/com/google/gerrit/server/restapi/project/LabelsCollection.java @@ -14,7 +14,7 @@ package com.google.gerrit.server.restapi.project; -import com.google.gerrit.common.data.LabelType; +import com.google.gerrit.entities.LabelType; import com.google.gerrit.extensions.registration.DynamicMap; import com.google.gerrit.extensions.restapi.AuthException; import com.google.gerrit.extensions.restapi.ChildCollection; diff --git a/java/com/google/gerrit/server/restapi/project/ListLabels.java b/java/com/google/gerrit/server/restapi/project/ListLabels.java index 19a8915733..56ee4cd3ce 100644 --- a/java/com/google/gerrit/server/restapi/project/ListLabels.java +++ b/java/com/google/gerrit/server/restapi/project/ListLabels.java @@ -14,7 +14,7 @@ package com.google.gerrit.server.restapi.project; -import com.google.gerrit.common.data.LabelType; +import com.google.gerrit.entities.LabelType; import com.google.gerrit.extensions.common.LabelDefinitionInfo; import com.google.gerrit.extensions.restapi.AuthException; import com.google.gerrit.extensions.restapi.Response; diff --git a/java/com/google/gerrit/server/restapi/project/PostLabels.java b/java/com/google/gerrit/server/restapi/project/PostLabels.java index 8835359275..0c42ab27ef 100644 --- a/java/com/google/gerrit/server/restapi/project/PostLabels.java +++ b/java/com/google/gerrit/server/restapi/project/PostLabels.java @@ -15,7 +15,7 @@ package com.google.gerrit.server.restapi.project; import com.google.common.base.Strings; -import com.google.gerrit.common.data.LabelType; +import com.google.gerrit.entities.LabelType; import com.google.gerrit.extensions.common.BatchLabelInput; import com.google.gerrit.extensions.common.LabelDefinitionInput; import com.google.gerrit.extensions.restapi.AuthException; diff --git a/java/com/google/gerrit/server/restapi/project/SetAccess.java b/java/com/google/gerrit/server/restapi/project/SetAccess.java index 02c1b545fe..794cae840c 100644 --- a/java/com/google/gerrit/server/restapi/project/SetAccess.java +++ b/java/com/google/gerrit/server/restapi/project/SetAccess.java @@ -16,7 +16,7 @@ package com.google.gerrit.server.restapi.project; import com.google.common.base.Strings; import com.google.common.collect.Iterables; -import com.google.gerrit.common.data.AccessSection; +import com.google.gerrit.entities.AccessSection; import com.google.gerrit.entities.Project; import com.google.gerrit.exceptions.InvalidNameException; import com.google.gerrit.extensions.api.access.ProjectAccessInfo; diff --git a/java/com/google/gerrit/server/restapi/project/SetAccessUtil.java b/java/com/google/gerrit/server/restapi/project/SetAccessUtil.java index 572b798ccc..65cc5a23e8 100644 --- a/java/com/google/gerrit/server/restapi/project/SetAccessUtil.java +++ b/java/com/google/gerrit/server/restapi/project/SetAccessUtil.java @@ -15,13 +15,13 @@ package com.google.gerrit.server.restapi.project; import com.google.common.collect.Iterables; -import com.google.gerrit.common.data.AccessSection; import com.google.gerrit.common.data.GlobalCapability; -import com.google.gerrit.common.data.LabelType; -import com.google.gerrit.common.data.Permission; -import com.google.gerrit.common.data.PermissionRule; +import com.google.gerrit.entities.AccessSection; import com.google.gerrit.entities.GroupDescription; import com.google.gerrit.entities.GroupReference; +import com.google.gerrit.entities.LabelType; +import com.google.gerrit.entities.Permission; +import com.google.gerrit.entities.PermissionRule; import com.google.gerrit.entities.Project; import com.google.gerrit.exceptions.InvalidNameException; import com.google.gerrit.extensions.api.access.AccessSectionInfo; diff --git a/java/com/google/gerrit/server/restapi/project/SetLabel.java b/java/com/google/gerrit/server/restapi/project/SetLabel.java index ade274a547..ffc591b5cd 100644 --- a/java/com/google/gerrit/server/restapi/project/SetLabel.java +++ b/java/com/google/gerrit/server/restapi/project/SetLabel.java @@ -15,7 +15,7 @@ package com.google.gerrit.server.restapi.project; import com.google.common.base.Strings; -import com.google.gerrit.common.data.LabelType; +import com.google.gerrit.entities.LabelType; import com.google.gerrit.extensions.common.LabelDefinitionInfo; import com.google.gerrit.extensions.common.LabelDefinitionInput; import com.google.gerrit.extensions.restapi.AuthException; diff --git a/java/com/google/gerrit/server/rules/DefaultSubmitRule.java b/java/com/google/gerrit/server/rules/DefaultSubmitRule.java index 799d70636f..4592100c1b 100644 --- a/java/com/google/gerrit/server/rules/DefaultSubmitRule.java +++ b/java/com/google/gerrit/server/rules/DefaultSubmitRule.java @@ -18,10 +18,10 @@ import static com.google.common.collect.ImmutableList.toImmutableList; import static com.google.gerrit.server.project.ProjectCache.illegalState; import com.google.common.flogger.FluentLogger; -import com.google.gerrit.common.data.LabelFunction; -import com.google.gerrit.common.data.LabelType; -import com.google.gerrit.common.data.SubmitRecord; +import com.google.gerrit.entities.LabelFunction; +import com.google.gerrit.entities.LabelType; import com.google.gerrit.entities.PatchSetApproval; +import com.google.gerrit.entities.SubmitRecord; import com.google.gerrit.exceptions.StorageException; import com.google.gerrit.extensions.annotations.Exports; import com.google.gerrit.extensions.config.FactoryModule; diff --git a/java/com/google/gerrit/server/rules/IgnoreSelfApprovalRule.java b/java/com/google/gerrit/server/rules/IgnoreSelfApprovalRule.java index 132747da7c..b2bfbd5120 100644 --- a/java/com/google/gerrit/server/rules/IgnoreSelfApprovalRule.java +++ b/java/com/google/gerrit/server/rules/IgnoreSelfApprovalRule.java @@ -18,12 +18,12 @@ import static com.google.common.collect.ImmutableList.toImmutableList; import com.google.common.annotations.VisibleForTesting; import com.google.common.flogger.FluentLogger; -import com.google.gerrit.common.data.LabelFunction; -import com.google.gerrit.common.data.LabelType; -import com.google.gerrit.common.data.SubmitRecord; -import com.google.gerrit.common.data.SubmitRequirement; import com.google.gerrit.entities.Account; +import com.google.gerrit.entities.LabelFunction; +import com.google.gerrit.entities.LabelType; import com.google.gerrit.entities.PatchSetApproval; +import com.google.gerrit.entities.SubmitRecord; +import com.google.gerrit.entities.SubmitRequirement; import com.google.gerrit.exceptions.StorageException; import com.google.gerrit.extensions.annotations.Exports; import com.google.gerrit.server.query.change.ChangeData; diff --git a/java/com/google/gerrit/server/rules/PrologRule.java b/java/com/google/gerrit/server/rules/PrologRule.java index 1861ee7619..8f17fa16a7 100644 --- a/java/com/google/gerrit/server/rules/PrologRule.java +++ b/java/com/google/gerrit/server/rules/PrologRule.java @@ -16,8 +16,8 @@ package com.google.gerrit.server.rules; import static com.google.gerrit.server.project.ProjectCache.illegalState; -import com.google.gerrit.common.data.SubmitRecord; -import com.google.gerrit.common.data.SubmitTypeRecord; +import com.google.gerrit.entities.SubmitRecord; +import com.google.gerrit.entities.SubmitTypeRecord; import com.google.gerrit.server.project.ProjectCache; import com.google.gerrit.server.project.ProjectState; import com.google.gerrit.server.query.change.ChangeData; diff --git a/java/com/google/gerrit/server/rules/PrologRuleEvaluator.java b/java/com/google/gerrit/server/rules/PrologRuleEvaluator.java index 87f5758912..57c4832bde 100644 --- a/java/com/google/gerrit/server/rules/PrologRuleEvaluator.java +++ b/java/com/google/gerrit/server/rules/PrologRuleEvaluator.java @@ -23,11 +23,11 @@ import static com.google.gerrit.server.project.SubmitRuleEvaluator.defaultTypeEr import com.google.common.annotations.VisibleForTesting; import com.google.common.base.CharMatcher; import com.google.common.flogger.FluentLogger; -import com.google.gerrit.common.data.LabelType; -import com.google.gerrit.common.data.SubmitRecord; -import com.google.gerrit.common.data.SubmitTypeRecord; import com.google.gerrit.entities.Account; import com.google.gerrit.entities.Change; +import com.google.gerrit.entities.LabelType; +import com.google.gerrit.entities.SubmitRecord; +import com.google.gerrit.entities.SubmitTypeRecord; import com.google.gerrit.exceptions.StorageException; import com.google.gerrit.extensions.client.SubmitType; import com.google.gerrit.server.account.AccountCache; diff --git a/java/com/google/gerrit/server/rules/SubmitRule.java b/java/com/google/gerrit/server/rules/SubmitRule.java index b221117f86..90d2137866 100644 --- a/java/com/google/gerrit/server/rules/SubmitRule.java +++ b/java/com/google/gerrit/server/rules/SubmitRule.java @@ -13,7 +13,7 @@ // limitations under the License. package com.google.gerrit.server.rules; -import com.google.gerrit.common.data.SubmitRecord; +import com.google.gerrit.entities.SubmitRecord; import com.google.gerrit.extensions.annotations.ExtensionPoint; import com.google.gerrit.server.query.change.ChangeData; import java.util.Optional; diff --git a/java/com/google/gerrit/server/schema/AclUtil.java b/java/com/google/gerrit/server/schema/AclUtil.java index 6db9339772..911756b4c5 100644 --- a/java/com/google/gerrit/server/schema/AclUtil.java +++ b/java/com/google/gerrit/server/schema/AclUtil.java @@ -14,11 +14,11 @@ package com.google.gerrit.server.schema; -import com.google.gerrit.common.data.AccessSection; -import com.google.gerrit.common.data.LabelType; -import com.google.gerrit.common.data.Permission; -import com.google.gerrit.common.data.PermissionRule; +import com.google.gerrit.entities.AccessSection; import com.google.gerrit.entities.GroupReference; +import com.google.gerrit.entities.LabelType; +import com.google.gerrit.entities.Permission; +import com.google.gerrit.entities.PermissionRule; import com.google.gerrit.server.project.ProjectConfig; /** diff --git a/java/com/google/gerrit/server/schema/AllProjectsCreator.java b/java/com/google/gerrit/server/schema/AllProjectsCreator.java index cd3c94551c..8083118316 100644 --- a/java/com/google/gerrit/server/schema/AllProjectsCreator.java +++ b/java/com/google/gerrit/server/schema/AllProjectsCreator.java @@ -23,12 +23,12 @@ import static com.google.gerrit.server.schema.AclUtil.grant; import static com.google.gerrit.server.schema.AclUtil.rule; import com.google.gerrit.common.Version; -import com.google.gerrit.common.data.AccessSection; import com.google.gerrit.common.data.GlobalCapability; -import com.google.gerrit.common.data.LabelType; -import com.google.gerrit.common.data.Permission; -import com.google.gerrit.common.data.PermissionRule.Action; +import com.google.gerrit.entities.AccessSection; import com.google.gerrit.entities.GroupReference; +import com.google.gerrit.entities.LabelType; +import com.google.gerrit.entities.Permission; +import com.google.gerrit.entities.PermissionRule.Action; import com.google.gerrit.entities.RefNames; import com.google.gerrit.server.GerritPersonIdent; import com.google.gerrit.server.config.AllProjectsName; diff --git a/java/com/google/gerrit/server/schema/AllProjectsInput.java b/java/com/google/gerrit/server/schema/AllProjectsInput.java index bd405f759c..f8473b20e0 100644 --- a/java/com/google/gerrit/server/schema/AllProjectsInput.java +++ b/java/com/google/gerrit/server/schema/AllProjectsInput.java @@ -18,9 +18,9 @@ import com.google.auto.value.AutoValue; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.gerrit.common.UsedAt; -import com.google.gerrit.common.data.LabelType; import com.google.gerrit.entities.BooleanProjectConfig; import com.google.gerrit.entities.GroupReference; +import com.google.gerrit.entities.LabelType; import com.google.gerrit.entities.LabelValue; import com.google.gerrit.extensions.client.InheritableBoolean; import com.google.gerrit.server.notedb.Sequences; diff --git a/java/com/google/gerrit/server/schema/AllUsersCreator.java b/java/com/google/gerrit/server/schema/AllUsersCreator.java index 89fd3654d7..90973fb8c2 100644 --- a/java/com/google/gerrit/server/schema/AllUsersCreator.java +++ b/java/com/google/gerrit/server/schema/AllUsersCreator.java @@ -22,9 +22,9 @@ import static com.google.gerrit.server.schema.AllProjectsInput.getDefaultCodeRev import com.google.gerrit.common.Nullable; import com.google.gerrit.common.UsedAt; import com.google.gerrit.common.Version; -import com.google.gerrit.common.data.LabelType; -import com.google.gerrit.common.data.Permission; import com.google.gerrit.entities.GroupReference; +import com.google.gerrit.entities.LabelType; +import com.google.gerrit.entities.Permission; import com.google.gerrit.entities.RefNames; import com.google.gerrit.server.GerritPersonIdent; import com.google.gerrit.server.config.AllUsersName; diff --git a/java/com/google/gerrit/server/schema/GrantRevertPermission.java b/java/com/google/gerrit/server/schema/GrantRevertPermission.java index 77513d3305..f3404bc222 100644 --- a/java/com/google/gerrit/server/schema/GrantRevertPermission.java +++ b/java/com/google/gerrit/server/schema/GrantRevertPermission.java @@ -18,9 +18,9 @@ import static com.google.gerrit.server.group.SystemGroupBackend.REGISTERED_USERS import static com.google.gerrit.server.schema.AclUtil.grant; import static com.google.gerrit.server.schema.AclUtil.remove; -import com.google.gerrit.common.data.AccessSection; -import com.google.gerrit.common.data.Permission; +import com.google.gerrit.entities.AccessSection; import com.google.gerrit.entities.GroupReference; +import com.google.gerrit.entities.Permission; import com.google.gerrit.entities.Project; import com.google.gerrit.server.GerritPersonIdent; import com.google.gerrit.server.extensions.events.GitReferenceUpdated; diff --git a/java/com/google/gerrit/server/schema/ProjectConfigSchemaUpdate.java b/java/com/google/gerrit/server/schema/ProjectConfigSchemaUpdate.java index 21ce1d15dc..868e7ea220 100644 --- a/java/com/google/gerrit/server/schema/ProjectConfigSchemaUpdate.java +++ b/java/com/google/gerrit/server/schema/ProjectConfigSchemaUpdate.java @@ -19,7 +19,7 @@ import static java.util.stream.Collectors.toList; import com.google.common.annotations.VisibleForTesting; import com.google.gerrit.common.Nullable; -import com.google.gerrit.common.data.PermissionRule; +import com.google.gerrit.entities.PermissionRule; import com.google.gerrit.entities.RefNames; import com.google.gerrit.exceptions.StorageException; import com.google.gerrit.server.config.AllProjectsName; diff --git a/java/com/google/gerrit/server/submit/LocalMergeSuperSetComputation.java b/java/com/google/gerrit/server/submit/LocalMergeSuperSetComputation.java index b8b8b557b9..0b05607a56 100644 --- a/java/com/google/gerrit/server/submit/LocalMergeSuperSetComputation.java +++ b/java/com/google/gerrit/server/submit/LocalMergeSuperSetComputation.java @@ -22,9 +22,9 @@ import com.google.common.collect.ImmutableListMultimap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; import com.google.common.flogger.FluentLogger; -import com.google.gerrit.common.data.SubmitTypeRecord; import com.google.gerrit.entities.BranchNameKey; import com.google.gerrit.entities.Project; +import com.google.gerrit.entities.SubmitTypeRecord; import com.google.gerrit.exceptions.StorageException; import com.google.gerrit.extensions.client.SubmitType; import com.google.gerrit.extensions.registration.DynamicItem; diff --git a/java/com/google/gerrit/server/submit/MergeOp.java b/java/com/google/gerrit/server/submit/MergeOp.java index f96b0c5518..4dc2c1c962 100644 --- a/java/com/google/gerrit/server/submit/MergeOp.java +++ b/java/com/google/gerrit/server/submit/MergeOp.java @@ -32,15 +32,15 @@ import com.google.common.collect.MultimapBuilder; import com.google.common.collect.SetMultimap; import com.google.common.flogger.FluentLogger; import com.google.gerrit.common.Nullable; -import com.google.gerrit.common.data.SubmitRecord; -import com.google.gerrit.common.data.SubmitRequirement; -import com.google.gerrit.common.data.SubmitTypeRecord; import com.google.gerrit.entities.BranchNameKey; import com.google.gerrit.entities.Change; import com.google.gerrit.entities.ChangeMessage; import com.google.gerrit.entities.PatchSet; import com.google.gerrit.entities.Project; import com.google.gerrit.entities.SubmissionId; +import com.google.gerrit.entities.SubmitRecord; +import com.google.gerrit.entities.SubmitRequirement; +import com.google.gerrit.entities.SubmitTypeRecord; import com.google.gerrit.exceptions.StorageException; import com.google.gerrit.extensions.api.changes.NotifyHandling; import com.google.gerrit.extensions.api.changes.SubmitInput; diff --git a/java/com/google/gerrit/server/submit/SubmitStrategyOp.java b/java/com/google/gerrit/server/submit/SubmitStrategyOp.java index ab28aa9faf..3cc566b7c0 100644 --- a/java/com/google/gerrit/server/submit/SubmitStrategyOp.java +++ b/java/com/google/gerrit/server/submit/SubmitStrategyOp.java @@ -22,7 +22,6 @@ import static java.util.Comparator.comparing; import static java.util.Objects.requireNonNull; import com.google.common.flogger.FluentLogger; -import com.google.gerrit.common.data.SubmitRecord; import com.google.gerrit.entities.BranchNameKey; import com.google.gerrit.entities.Change; import com.google.gerrit.entities.ChangeMessage; @@ -31,6 +30,7 @@ import com.google.gerrit.entities.PatchSet; import com.google.gerrit.entities.PatchSetApproval; import com.google.gerrit.entities.Project; import com.google.gerrit.entities.RefNames; +import com.google.gerrit.entities.SubmitRecord; import com.google.gerrit.exceptions.StorageException; import com.google.gerrit.server.ApprovalsUtil; import com.google.gerrit.server.ChangeMessagesUtil; diff --git a/java/com/google/gerrit/server/submit/SubscriptionGraph.java b/java/com/google/gerrit/server/submit/SubscriptionGraph.java index f037261867..f6cffbd167 100644 --- a/java/com/google/gerrit/server/submit/SubscriptionGraph.java +++ b/java/com/google/gerrit/server/submit/SubscriptionGraph.java @@ -22,11 +22,11 @@ import com.google.common.collect.ImmutableSetMultimap; import com.google.common.collect.MultimapBuilder; import com.google.common.collect.SetMultimap; import com.google.common.flogger.FluentLogger; -import com.google.gerrit.common.data.SubscribeSection; import com.google.gerrit.entities.BranchNameKey; import com.google.gerrit.entities.Project; import com.google.gerrit.entities.RefNames; import com.google.gerrit.entities.SubmoduleSubscription; +import com.google.gerrit.entities.SubscribeSection; import com.google.gerrit.exceptions.StorageException; import com.google.gerrit.server.project.NoSuchProjectException; import com.google.gerrit.server.project.ProjectCache; diff --git a/java/com/google/gerrit/server/util/LabelVote.java b/java/com/google/gerrit/server/util/LabelVote.java index a03c1f2d83..038fe2c092 100644 --- a/java/com/google/gerrit/server/util/LabelVote.java +++ b/java/com/google/gerrit/server/util/LabelVote.java @@ -18,7 +18,7 @@ import static com.google.common.base.Preconditions.checkArgument; import com.google.auto.value.AutoValue; import com.google.common.base.Strings; -import com.google.gerrit.common.data.LabelType; +import com.google.gerrit.entities.LabelType; /** A single vote on a label, consisting of a label name and a value. */ @AutoValue diff --git a/java/com/google/gerrit/server/util/MostSpecificComparator.java b/java/com/google/gerrit/server/util/MostSpecificComparator.java index b22617cc9b..ac33902b1a 100644 --- a/java/com/google/gerrit/server/util/MostSpecificComparator.java +++ b/java/com/google/gerrit/server/util/MostSpecificComparator.java @@ -14,7 +14,7 @@ package com.google.gerrit.server.util; -import com.google.gerrit.common.data.AccessSection; +import com.google.gerrit.entities.AccessSection; import com.google.gerrit.server.project.RefPattern; import java.util.Comparator; import org.apache.commons.lang.StringUtils; diff --git a/java/com/google/gerrit/sshd/commands/ReviewCommand.java b/java/com/google/gerrit/sshd/commands/ReviewCommand.java index 42d781f8fc..78a7381721 100644 --- a/java/com/google/gerrit/sshd/commands/ReviewCommand.java +++ b/java/com/google/gerrit/sshd/commands/ReviewCommand.java @@ -22,7 +22,7 @@ import com.google.common.base.Strings; import com.google.common.collect.ImmutableList; import com.google.common.flogger.FluentLogger; import com.google.common.io.CharStreams; -import com.google.gerrit.common.data.LabelType; +import com.google.gerrit.entities.LabelType; import com.google.gerrit.entities.LabelValue; import com.google.gerrit.entities.PatchSet; import com.google.gerrit.exceptions.StorageException; diff --git a/java/gerrit/PRED__load_commit_labels_1.java b/java/gerrit/PRED__load_commit_labels_1.java index 90a2cbf1d4..5ee292ff55 100644 --- a/java/gerrit/PRED__load_commit_labels_1.java +++ b/java/gerrit/PRED__load_commit_labels_1.java @@ -2,8 +2,8 @@ package gerrit; -import com.google.gerrit.common.data.LabelType; -import com.google.gerrit.common.data.LabelTypes; +import com.google.gerrit.entities.LabelType; +import com.google.gerrit.entities.LabelTypes; import com.google.gerrit.entities.PatchSetApproval; import com.google.gerrit.server.query.change.ChangeData; import com.google.gerrit.server.rules.StoredValues; diff --git a/java/gerrit/PRED_get_legacy_label_types_1.java b/java/gerrit/PRED_get_legacy_label_types_1.java index 956e821463..dfed17ba48 100644 --- a/java/gerrit/PRED_get_legacy_label_types_1.java +++ b/java/gerrit/PRED_get_legacy_label_types_1.java @@ -14,7 +14,7 @@ package gerrit; -import com.google.gerrit.common.data.LabelType; +import com.google.gerrit.entities.LabelType; import com.google.gerrit.entities.LabelValue; import com.google.gerrit.server.rules.StoredValues; import com.googlecode.prolog_cafe.exceptions.PrologException; diff --git a/javatests/com/google/gerrit/acceptance/api/accounts/AccountIT.java b/javatests/com/google/gerrit/acceptance/api/accounts/AccountIT.java index 60c2543c68..aaca9e85c8 100644 --- a/javatests/com/google/gerrit/acceptance/api/accounts/AccountIT.java +++ b/javatests/com/google/gerrit/acceptance/api/accounts/AccountIT.java @@ -76,16 +76,16 @@ import com.google.gerrit.acceptance.testsuite.group.GroupOperations; import com.google.gerrit.acceptance.testsuite.project.ProjectOperations; import com.google.gerrit.acceptance.testsuite.request.RequestScopeOperations; import com.google.gerrit.common.Nullable; -import com.google.gerrit.common.data.AccessSection; import com.google.gerrit.common.data.GlobalCapability; -import com.google.gerrit.common.data.Permission; -import com.google.gerrit.common.data.PermissionRule.Action; +import com.google.gerrit.entities.AccessSection; import com.google.gerrit.entities.Account; import com.google.gerrit.entities.AccountGroup; import com.google.gerrit.entities.Address; import com.google.gerrit.entities.BranchNameKey; import com.google.gerrit.entities.Change; import com.google.gerrit.entities.GroupReference; +import com.google.gerrit.entities.Permission; +import com.google.gerrit.entities.PermissionRule.Action; import com.google.gerrit.entities.Project; import com.google.gerrit.entities.RefNames; import com.google.gerrit.exceptions.StorageException; diff --git a/javatests/com/google/gerrit/acceptance/api/accounts/AgreementsIT.java b/javatests/com/google/gerrit/acceptance/api/accounts/AgreementsIT.java index c4bb47ab41..4c3c77f12b 100644 --- a/javatests/com/google/gerrit/acceptance/api/accounts/AgreementsIT.java +++ b/javatests/com/google/gerrit/acceptance/api/accounts/AgreementsIT.java @@ -28,11 +28,11 @@ import com.google.gerrit.acceptance.config.GerritConfig; import com.google.gerrit.acceptance.testsuite.group.GroupOperations; import com.google.gerrit.acceptance.testsuite.request.RequestScopeOperations; import com.google.gerrit.common.RawInputUtil; -import com.google.gerrit.common.data.ContributorAgreement; -import com.google.gerrit.common.data.PermissionRule; import com.google.gerrit.entities.AccountGroup; import com.google.gerrit.entities.BooleanProjectConfig; +import com.google.gerrit.entities.ContributorAgreement; import com.google.gerrit.entities.GroupReference; +import com.google.gerrit.entities.PermissionRule; import com.google.gerrit.extensions.api.changes.CherryPickInput; import com.google.gerrit.extensions.api.changes.ReviewInput; import com.google.gerrit.extensions.api.changes.SubmitInput; diff --git a/javatests/com/google/gerrit/acceptance/api/change/AbandonIT.java b/javatests/com/google/gerrit/acceptance/api/change/AbandonIT.java index d04eebd8ce..80431ee596 100644 --- a/javatests/com/google/gerrit/acceptance/api/change/AbandonIT.java +++ b/javatests/com/google/gerrit/acceptance/api/change/AbandonIT.java @@ -31,7 +31,7 @@ import com.google.gerrit.acceptance.UseClockStep; import com.google.gerrit.acceptance.config.GerritConfig; import com.google.gerrit.acceptance.testsuite.project.ProjectOperations; import com.google.gerrit.acceptance.testsuite.request.RequestScopeOperations; -import com.google.gerrit.common.data.Permission; +import com.google.gerrit.entities.Permission; import com.google.gerrit.entities.Project; import com.google.gerrit.extensions.api.changes.ReviewInput; import com.google.gerrit.extensions.client.ChangeStatus; diff --git a/javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java b/javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java index e7c0f89654..d4affb7571 100644 --- a/javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java +++ b/javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java @@ -89,15 +89,15 @@ import com.google.gerrit.acceptance.testsuite.request.RequestScopeOperations; import com.google.gerrit.common.FooterConstants; import com.google.gerrit.common.RawInputUtil; import com.google.gerrit.common.data.GlobalCapability; -import com.google.gerrit.common.data.LabelFunction; -import com.google.gerrit.common.data.LabelType; -import com.google.gerrit.common.data.Permission; import com.google.gerrit.entities.Account; import com.google.gerrit.entities.AccountGroup; import com.google.gerrit.entities.Address; import com.google.gerrit.entities.BranchNameKey; import com.google.gerrit.entities.Change; +import com.google.gerrit.entities.LabelFunction; +import com.google.gerrit.entities.LabelType; import com.google.gerrit.entities.PatchSet; +import com.google.gerrit.entities.Permission; import com.google.gerrit.entities.Project; import com.google.gerrit.entities.RefNames; import com.google.gerrit.exceptions.StorageException; diff --git a/javatests/com/google/gerrit/acceptance/api/change/ChangeSubmitRequirementIT.java b/javatests/com/google/gerrit/acceptance/api/change/ChangeSubmitRequirementIT.java index 40dd70ed7f..fd9af0eb8e 100644 --- a/javatests/com/google/gerrit/acceptance/api/change/ChangeSubmitRequirementIT.java +++ b/javatests/com/google/gerrit/acceptance/api/change/ChangeSubmitRequirementIT.java @@ -19,8 +19,8 @@ import static com.google.common.truth.Truth.assertThat; import com.google.common.collect.ImmutableList; import com.google.gerrit.acceptance.AbstractDaemonTest; import com.google.gerrit.acceptance.PushOneCommit; -import com.google.gerrit.common.data.SubmitRecord; -import com.google.gerrit.common.data.SubmitRequirement; +import com.google.gerrit.entities.SubmitRecord; +import com.google.gerrit.entities.SubmitRequirement; import com.google.gerrit.extensions.annotations.Exports; import com.google.gerrit.extensions.common.ChangeInfo; import com.google.gerrit.extensions.common.SubmitRequirementInfo; diff --git a/javatests/com/google/gerrit/acceptance/api/change/PrivateChangeIT.java b/javatests/com/google/gerrit/acceptance/api/change/PrivateChangeIT.java index f043c9b3c9..97b7148d01 100644 --- a/javatests/com/google/gerrit/acceptance/api/change/PrivateChangeIT.java +++ b/javatests/com/google/gerrit/acceptance/api/change/PrivateChangeIT.java @@ -24,8 +24,8 @@ import com.google.gerrit.acceptance.AbstractDaemonTest; import com.google.gerrit.acceptance.PushOneCommit; import com.google.gerrit.acceptance.testsuite.project.ProjectOperations; import com.google.gerrit.acceptance.testsuite.request.RequestScopeOperations; -import com.google.gerrit.common.data.Permission; import com.google.gerrit.entities.Change; +import com.google.gerrit.entities.Permission; import com.google.gerrit.extensions.client.ChangeStatus; import com.google.gerrit.extensions.common.ChangeInfo; import com.google.gerrit.extensions.restapi.AuthException; diff --git a/javatests/com/google/gerrit/acceptance/api/change/QueryChangesIT.java b/javatests/com/google/gerrit/acceptance/api/change/QueryChangesIT.java index 448f347501..7865e326ad 100644 --- a/javatests/com/google/gerrit/acceptance/api/change/QueryChangesIT.java +++ b/javatests/com/google/gerrit/acceptance/api/change/QueryChangesIT.java @@ -29,9 +29,9 @@ import com.google.gerrit.acceptance.UseClockStep; import com.google.gerrit.acceptance.config.GerritConfig; import com.google.gerrit.acceptance.testsuite.account.AccountOperations; import com.google.gerrit.acceptance.testsuite.project.ProjectOperations; -import com.google.gerrit.common.data.Permission; import com.google.gerrit.entities.Account; import com.google.gerrit.entities.Patch; +import com.google.gerrit.entities.Permission; import com.google.gerrit.entities.Project; import com.google.gerrit.extensions.api.changes.ReviewInput; import com.google.gerrit.extensions.common.ChangeInfo; diff --git a/javatests/com/google/gerrit/acceptance/api/change/RevertIT.java b/javatests/com/google/gerrit/acceptance/api/change/RevertIT.java index b855e7206b..69278b470b 100644 --- a/javatests/com/google/gerrit/acceptance/api/change/RevertIT.java +++ b/javatests/com/google/gerrit/acceptance/api/change/RevertIT.java @@ -26,8 +26,8 @@ import com.google.gerrit.acceptance.TestProjectInput; import com.google.gerrit.acceptance.config.GerritConfig; import com.google.gerrit.acceptance.testsuite.project.ProjectOperations; import com.google.gerrit.acceptance.testsuite.request.RequestScopeOperations; -import com.google.gerrit.common.data.Permission; import com.google.gerrit.entities.BranchNameKey; +import com.google.gerrit.entities.Permission; import com.google.gerrit.entities.Project; import com.google.gerrit.entities.RefNames; import com.google.gerrit.extensions.api.changes.ChangeApi; diff --git a/javatests/com/google/gerrit/acceptance/api/change/StickyApprovalsIT.java b/javatests/com/google/gerrit/acceptance/api/change/StickyApprovalsIT.java index 3d8a03425f..58ea6ea541 100644 --- a/javatests/com/google/gerrit/acceptance/api/change/StickyApprovalsIT.java +++ b/javatests/com/google/gerrit/acceptance/api/change/StickyApprovalsIT.java @@ -39,7 +39,7 @@ import com.google.gerrit.acceptance.PushOneCommit; import com.google.gerrit.acceptance.TestAccount; import com.google.gerrit.acceptance.testsuite.project.ProjectOperations; import com.google.gerrit.acceptance.testsuite.request.RequestScopeOperations; -import com.google.gerrit.common.data.LabelType; +import com.google.gerrit.entities.LabelType; import com.google.gerrit.entities.RefNames; import com.google.gerrit.extensions.api.changes.CherryPickInput; import com.google.gerrit.extensions.api.changes.ReviewInput; diff --git a/javatests/com/google/gerrit/acceptance/api/group/GroupsIT.java b/javatests/com/google/gerrit/acceptance/api/group/GroupsIT.java index acebe67f6b..9e405c7f51 100644 --- a/javatests/com/google/gerrit/acceptance/api/group/GroupsIT.java +++ b/javatests/com/google/gerrit/acceptance/api/group/GroupsIT.java @@ -56,10 +56,10 @@ import com.google.gerrit.acceptance.testsuite.project.ProjectOperations; import com.google.gerrit.acceptance.testsuite.request.RequestScopeOperations; import com.google.gerrit.common.Nullable; import com.google.gerrit.common.data.GlobalCapability; -import com.google.gerrit.common.data.Permission; import com.google.gerrit.entities.Account; import com.google.gerrit.entities.AccountGroup; import com.google.gerrit.entities.GroupReference; +import com.google.gerrit.entities.Permission; import com.google.gerrit.entities.Project; import com.google.gerrit.entities.RefNames; import com.google.gerrit.extensions.api.changes.ReviewInput; diff --git a/javatests/com/google/gerrit/acceptance/api/project/CheckAccessIT.java b/javatests/com/google/gerrit/acceptance/api/project/CheckAccessIT.java index 3fc6e446a9..f1d537f581 100644 --- a/javatests/com/google/gerrit/acceptance/api/project/CheckAccessIT.java +++ b/javatests/com/google/gerrit/acceptance/api/project/CheckAccessIT.java @@ -27,8 +27,8 @@ import com.google.gerrit.acceptance.RestResponse; import com.google.gerrit.acceptance.TestAccount; import com.google.gerrit.acceptance.testsuite.group.GroupOperations; import com.google.gerrit.acceptance.testsuite.project.ProjectOperations; -import com.google.gerrit.common.data.Permission; import com.google.gerrit.entities.AccountGroup; +import com.google.gerrit.entities.Permission; import com.google.gerrit.entities.Project; import com.google.gerrit.entities.RefNames; import com.google.gerrit.extensions.api.config.AccessCheckInfo; diff --git a/javatests/com/google/gerrit/acceptance/api/project/CommitIT.java b/javatests/com/google/gerrit/acceptance/api/project/CommitIT.java index e67770c3ec..80e04c0d21 100644 --- a/javatests/com/google/gerrit/acceptance/api/project/CommitIT.java +++ b/javatests/com/google/gerrit/acceptance/api/project/CommitIT.java @@ -24,8 +24,8 @@ import com.google.gerrit.acceptance.NoHttpd; import com.google.gerrit.acceptance.PushOneCommit.Result; import com.google.gerrit.acceptance.TestAccount; import com.google.gerrit.acceptance.testsuite.project.ProjectOperations; -import com.google.gerrit.common.data.Permission; import com.google.gerrit.entities.BranchNameKey; +import com.google.gerrit.entities.Permission; import com.google.gerrit.extensions.api.changes.CherryPickInput; import com.google.gerrit.extensions.api.changes.IncludedInInfo; import com.google.gerrit.extensions.api.changes.ReviewInput; diff --git a/javatests/com/google/gerrit/acceptance/api/project/DashboardIT.java b/javatests/com/google/gerrit/acceptance/api/project/DashboardIT.java index 6442645563..a22b55818a 100644 --- a/javatests/com/google/gerrit/acceptance/api/project/DashboardIT.java +++ b/javatests/com/google/gerrit/acceptance/api/project/DashboardIT.java @@ -24,7 +24,7 @@ import com.google.common.collect.ImmutableList; import com.google.gerrit.acceptance.AbstractDaemonTest; import com.google.gerrit.acceptance.NoHttpd; import com.google.gerrit.acceptance.testsuite.project.ProjectOperations; -import com.google.gerrit.common.data.Permission; +import com.google.gerrit.entities.Permission; import com.google.gerrit.extensions.api.projects.BranchInput; import com.google.gerrit.extensions.api.projects.DashboardInfo; import com.google.gerrit.extensions.api.projects.DashboardSectionInfo; diff --git a/javatests/com/google/gerrit/acceptance/api/project/ProjectIT.java b/javatests/com/google/gerrit/acceptance/api/project/ProjectIT.java index 840d3e0c2c..e99a6f576e 100644 --- a/javatests/com/google/gerrit/acceptance/api/project/ProjectIT.java +++ b/javatests/com/google/gerrit/acceptance/api/project/ProjectIT.java @@ -39,8 +39,8 @@ import com.google.gerrit.acceptance.RestResponse; import com.google.gerrit.acceptance.config.GerritConfig; import com.google.gerrit.acceptance.testsuite.project.ProjectOperations; import com.google.gerrit.acceptance.testsuite.request.RequestScopeOperations; -import com.google.gerrit.common.data.Permission; import com.google.gerrit.entities.Change; +import com.google.gerrit.entities.Permission; import com.google.gerrit.entities.Project; import com.google.gerrit.entities.RefNames; import com.google.gerrit.extensions.annotations.Exports; diff --git a/javatests/com/google/gerrit/acceptance/api/project/SetParentIT.java b/javatests/com/google/gerrit/acceptance/api/project/SetParentIT.java index 153933412e..2bdbe5023e 100644 --- a/javatests/com/google/gerrit/acceptance/api/project/SetParentIT.java +++ b/javatests/com/google/gerrit/acceptance/api/project/SetParentIT.java @@ -23,7 +23,7 @@ import com.google.gerrit.acceptance.NoHttpd; import com.google.gerrit.acceptance.config.GerritConfig; import com.google.gerrit.acceptance.testsuite.project.ProjectOperations; import com.google.gerrit.acceptance.testsuite.request.RequestScopeOperations; -import com.google.gerrit.common.data.Permission; +import com.google.gerrit.entities.Permission; import com.google.gerrit.entities.Project; import com.google.gerrit.extensions.restapi.AuthException; import com.google.gerrit.extensions.restapi.BadRequestException; diff --git a/javatests/com/google/gerrit/acceptance/api/revision/RevisionIT.java b/javatests/com/google/gerrit/acceptance/api/revision/RevisionIT.java index d9d2f65fb3..50a77aca71 100644 --- a/javatests/com/google/gerrit/acceptance/api/revision/RevisionIT.java +++ b/javatests/com/google/gerrit/acceptance/api/revision/RevisionIT.java @@ -50,12 +50,12 @@ import com.google.gerrit.acceptance.TestProjectInput; import com.google.gerrit.acceptance.config.GerritConfig; import com.google.gerrit.acceptance.testsuite.project.ProjectOperations; import com.google.gerrit.acceptance.testsuite.request.RequestScopeOperations; -import com.google.gerrit.common.data.Permission; import com.google.gerrit.entities.Account; import com.google.gerrit.entities.BranchNameKey; import com.google.gerrit.entities.BranchOrderSection; import com.google.gerrit.entities.Change; import com.google.gerrit.entities.PatchSetApproval; +import com.google.gerrit.entities.Permission; import com.google.gerrit.entities.RefNames; import com.google.gerrit.extensions.api.changes.ChangeApi; import com.google.gerrit.extensions.api.changes.CherryPickInput; diff --git a/javatests/com/google/gerrit/acceptance/edit/ChangeEditIT.java b/javatests/com/google/gerrit/acceptance/edit/ChangeEditIT.java index d36124732d..22cecdb2cc 100644 --- a/javatests/com/google/gerrit/acceptance/edit/ChangeEditIT.java +++ b/javatests/com/google/gerrit/acceptance/edit/ChangeEditIT.java @@ -40,10 +40,10 @@ import com.google.gerrit.acceptance.UseClockStep; import com.google.gerrit.acceptance.testsuite.project.ProjectOperations; import com.google.gerrit.acceptance.testsuite.request.RequestScopeOperations; import com.google.gerrit.common.RawInputUtil; -import com.google.gerrit.common.data.LabelType; -import com.google.gerrit.common.data.Permission; +import com.google.gerrit.entities.LabelType; import com.google.gerrit.entities.Patch; import com.google.gerrit.entities.PatchSet; +import com.google.gerrit.entities.Permission; import com.google.gerrit.entities.Project; import com.google.gerrit.extensions.api.changes.AddReviewerInput; import com.google.gerrit.extensions.api.changes.FileContentInput; diff --git a/javatests/com/google/gerrit/acceptance/git/AbstractForcePush.java b/javatests/com/google/gerrit/acceptance/git/AbstractForcePush.java index 3b80312a35..88d09379ea 100644 --- a/javatests/com/google/gerrit/acceptance/git/AbstractForcePush.java +++ b/javatests/com/google/gerrit/acceptance/git/AbstractForcePush.java @@ -24,7 +24,7 @@ import static org.eclipse.jgit.transport.RemoteRefUpdate.Status.REJECTED_OTHER_R import com.google.gerrit.acceptance.AbstractDaemonTest; import com.google.gerrit.acceptance.PushOneCommit; import com.google.gerrit.acceptance.testsuite.project.ProjectOperations; -import com.google.gerrit.common.data.Permission; +import com.google.gerrit.entities.Permission; import com.google.gerrit.extensions.api.projects.BranchInput; import com.google.inject.Inject; import org.eclipse.jgit.lib.ObjectId; diff --git a/javatests/com/google/gerrit/acceptance/git/AbstractPushForReview.java b/javatests/com/google/gerrit/acceptance/git/AbstractPushForReview.java index 4c3c9d369d..6fb444fbee 100644 --- a/javatests/com/google/gerrit/acceptance/git/AbstractPushForReview.java +++ b/javatests/com/google/gerrit/acceptance/git/AbstractPushForReview.java @@ -63,14 +63,14 @@ import com.google.gerrit.acceptance.config.GerritConfig; import com.google.gerrit.acceptance.testsuite.project.ProjectOperations; import com.google.gerrit.acceptance.testsuite.request.RequestScopeOperations; import com.google.gerrit.common.data.GlobalCapability; -import com.google.gerrit.common.data.LabelType; -import com.google.gerrit.common.data.Permission; import com.google.gerrit.entities.AccountGroup; import com.google.gerrit.entities.Address; import com.google.gerrit.entities.BooleanProjectConfig; import com.google.gerrit.entities.Change; import com.google.gerrit.entities.ChangeMessage; +import com.google.gerrit.entities.LabelType; import com.google.gerrit.entities.PatchSet; +import com.google.gerrit.entities.Permission; import com.google.gerrit.entities.Project; import com.google.gerrit.entities.RefNames; import com.google.gerrit.extensions.api.changes.DraftInput; diff --git a/javatests/com/google/gerrit/acceptance/git/AbstractSubmitOnPush.java b/javatests/com/google/gerrit/acceptance/git/AbstractSubmitOnPush.java index f2accd45cc..23bcdec5dd 100644 --- a/javatests/com/google/gerrit/acceptance/git/AbstractSubmitOnPush.java +++ b/javatests/com/google/gerrit/acceptance/git/AbstractSubmitOnPush.java @@ -26,12 +26,12 @@ import com.google.gerrit.acceptance.PushOneCommit; import com.google.gerrit.acceptance.TestAccount; import com.google.gerrit.acceptance.testsuite.project.ProjectOperations; import com.google.gerrit.common.Nullable; -import com.google.gerrit.common.data.Permission; import com.google.gerrit.entities.Address; import com.google.gerrit.entities.Change; import com.google.gerrit.entities.EmailHeader; import com.google.gerrit.entities.PatchSet; import com.google.gerrit.entities.PatchSetApproval; +import com.google.gerrit.entities.Permission; import com.google.gerrit.entities.Project; import com.google.gerrit.entities.RefNames; import com.google.gerrit.extensions.api.changes.NotifyHandling; diff --git a/javatests/com/google/gerrit/acceptance/git/AbstractSubmoduleSubscription.java b/javatests/com/google/gerrit/acceptance/git/AbstractSubmoduleSubscription.java index df21625a58..415aa79558 100644 --- a/javatests/com/google/gerrit/acceptance/git/AbstractSubmoduleSubscription.java +++ b/javatests/com/google/gerrit/acceptance/git/AbstractSubmoduleSubscription.java @@ -22,9 +22,9 @@ import static java.util.stream.Collectors.toList; import com.google.common.collect.Iterables; import com.google.gerrit.acceptance.AbstractDaemonTest; import com.google.gerrit.acceptance.testsuite.project.ProjectOperations; -import com.google.gerrit.common.data.Permission; -import com.google.gerrit.common.data.SubscribeSection; +import com.google.gerrit.entities.Permission; import com.google.gerrit.entities.Project; +import com.google.gerrit.entities.SubscribeSection; import com.google.gerrit.extensions.client.SubmitType; import com.google.gerrit.server.git.meta.MetaDataUpdate; import com.google.gerrit.server.project.ProjectConfig; diff --git a/javatests/com/google/gerrit/acceptance/git/PushAccountIT.java b/javatests/com/google/gerrit/acceptance/git/PushAccountIT.java index 86fce9c190..27962dacd7 100644 --- a/javatests/com/google/gerrit/acceptance/git/PushAccountIT.java +++ b/javatests/com/google/gerrit/acceptance/git/PushAccountIT.java @@ -33,9 +33,9 @@ import com.google.gerrit.acceptance.TestAccount; import com.google.gerrit.acceptance.testsuite.project.ProjectOperations; import com.google.gerrit.acceptance.testsuite.request.RequestScopeOperations; import com.google.gerrit.common.data.GlobalCapability; -import com.google.gerrit.common.data.Permission; import com.google.gerrit.entities.Account; import com.google.gerrit.entities.NotifyConfig.NotifyType; +import com.google.gerrit.entities.Permission; import com.google.gerrit.entities.RefNames; import com.google.gerrit.extensions.api.changes.ReviewInput; import com.google.gerrit.extensions.common.AccountInfo; diff --git a/javatests/com/google/gerrit/acceptance/git/PushPermissionsIT.java b/javatests/com/google/gerrit/acceptance/git/PushPermissionsIT.java index b1c07ad957..64c8792af7 100644 --- a/javatests/com/google/gerrit/acceptance/git/PushPermissionsIT.java +++ b/javatests/com/google/gerrit/acceptance/git/PushPermissionsIT.java @@ -26,11 +26,11 @@ import com.google.common.collect.ImmutableMap; import com.google.gerrit.acceptance.AbstractDaemonTest; import com.google.gerrit.acceptance.testsuite.project.ProjectOperations; import com.google.gerrit.acceptance.testsuite.request.RequestScopeOperations; -import com.google.gerrit.common.data.AccessSection; import com.google.gerrit.common.data.GlobalCapability; -import com.google.gerrit.common.data.Permission; +import com.google.gerrit.entities.AccessSection; import com.google.gerrit.entities.Change; import com.google.gerrit.entities.PatchSet; +import com.google.gerrit.entities.Permission; import com.google.gerrit.extensions.api.changes.ReviewInput; import com.google.gerrit.extensions.client.ProjectState; import com.google.gerrit.extensions.common.ChangeInput; diff --git a/javatests/com/google/gerrit/acceptance/git/RefAdvertisementIT.java b/javatests/com/google/gerrit/acceptance/git/RefAdvertisementIT.java index 8b9d173d73..d4cd1fec7a 100644 --- a/javatests/com/google/gerrit/acceptance/git/RefAdvertisementIT.java +++ b/javatests/com/google/gerrit/acceptance/git/RefAdvertisementIT.java @@ -35,13 +35,13 @@ import com.google.gerrit.acceptance.config.GerritConfig; import com.google.gerrit.acceptance.testsuite.project.ProjectOperations; import com.google.gerrit.acceptance.testsuite.request.RequestScopeOperations; import com.google.gerrit.common.Nullable; -import com.google.gerrit.common.data.AccessSection; import com.google.gerrit.common.data.GlobalCapability; -import com.google.gerrit.common.data.Permission; +import com.google.gerrit.entities.AccessSection; import com.google.gerrit.entities.AccountGroup; import com.google.gerrit.entities.Change; import com.google.gerrit.entities.Patch; import com.google.gerrit.entities.PatchSet; +import com.google.gerrit.entities.Permission; import com.google.gerrit.entities.Project; import com.google.gerrit.entities.RefNames; import com.google.gerrit.extensions.api.changes.DraftInput; diff --git a/javatests/com/google/gerrit/acceptance/git/RefOperationValidationIT.java b/javatests/com/google/gerrit/acceptance/git/RefOperationValidationIT.java index d7952e479a..9c5afd23d5 100644 --- a/javatests/com/google/gerrit/acceptance/git/RefOperationValidationIT.java +++ b/javatests/com/google/gerrit/acceptance/git/RefOperationValidationIT.java @@ -31,7 +31,7 @@ import com.google.gerrit.acceptance.ExtensionRegistry.Registration; import com.google.gerrit.acceptance.PushOneCommit; import com.google.gerrit.acceptance.config.GerritConfig; import com.google.gerrit.acceptance.testsuite.project.ProjectOperations; -import com.google.gerrit.common.data.Permission; +import com.google.gerrit.entities.Permission; import com.google.gerrit.extensions.api.projects.BranchInput; import com.google.gerrit.extensions.restapi.RestApiException; import com.google.gerrit.server.events.RefReceivedEvent; diff --git a/javatests/com/google/gerrit/acceptance/git/SubmoduleSubscriptionsWholeTopicMergeIT.java b/javatests/com/google/gerrit/acceptance/git/SubmoduleSubscriptionsWholeTopicMergeIT.java index 0715b7e409..8367f6047d 100644 --- a/javatests/com/google/gerrit/acceptance/git/SubmoduleSubscriptionsWholeTopicMergeIT.java +++ b/javatests/com/google/gerrit/acceptance/git/SubmoduleSubscriptionsWholeTopicMergeIT.java @@ -24,8 +24,8 @@ import com.google.common.collect.ImmutableList; import com.google.gerrit.acceptance.NoHttpd; import com.google.gerrit.acceptance.testsuite.ThrowingConsumer; import com.google.gerrit.acceptance.testsuite.project.ProjectOperations; -import com.google.gerrit.common.data.Permission; import com.google.gerrit.entities.BranchNameKey; +import com.google.gerrit.entities.Permission; import com.google.gerrit.entities.Project; import com.google.gerrit.extensions.api.changes.ReviewInput; import com.google.gerrit.extensions.client.ChangeStatus; diff --git a/javatests/com/google/gerrit/acceptance/rest/PluginsCapabilityIT.java b/javatests/com/google/gerrit/acceptance/rest/PluginsCapabilityIT.java index af947f8a86..0780832bdf 100644 --- a/javatests/com/google/gerrit/acceptance/rest/PluginsCapabilityIT.java +++ b/javatests/com/google/gerrit/acceptance/rest/PluginsCapabilityIT.java @@ -21,7 +21,7 @@ import com.google.common.collect.ImmutableMap; import com.google.gerrit.acceptance.LightweightPluginDaemonTest; import com.google.gerrit.acceptance.TestPlugin; import com.google.gerrit.acceptance.rest.CreateTestPlugin.Input; -import com.google.gerrit.common.data.AccessSection; +import com.google.gerrit.entities.AccessSection; import com.google.gerrit.extensions.api.access.AccessSectionInfo; import com.google.gerrit.extensions.api.access.PermissionInfo; import com.google.gerrit.extensions.api.access.PermissionRuleInfo; diff --git a/javatests/com/google/gerrit/acceptance/rest/TraceIT.java b/javatests/com/google/gerrit/acceptance/rest/TraceIT.java index 09680fbd83..f5d9e3aff3 100644 --- a/javatests/com/google/gerrit/acceptance/rest/TraceIT.java +++ b/javatests/com/google/gerrit/acceptance/rest/TraceIT.java @@ -31,7 +31,7 @@ import com.google.gerrit.acceptance.ExtensionRegistry.Registration; import com.google.gerrit.acceptance.PushOneCommit; import com.google.gerrit.acceptance.RestResponse; import com.google.gerrit.acceptance.config.GerritConfig; -import com.google.gerrit.common.data.SubmitRecord; +import com.google.gerrit.entities.SubmitRecord; import com.google.gerrit.extensions.api.changes.ReviewInput; import com.google.gerrit.extensions.events.ChangeIndexedListener; import com.google.gerrit.httpd.restapi.ParameterParser; diff --git a/javatests/com/google/gerrit/acceptance/rest/account/ExternalIdIT.java b/javatests/com/google/gerrit/acceptance/rest/account/ExternalIdIT.java index 53e871f8e7..ac82a781c3 100644 --- a/javatests/com/google/gerrit/acceptance/rest/account/ExternalIdIT.java +++ b/javatests/com/google/gerrit/acceptance/rest/account/ExternalIdIT.java @@ -41,8 +41,8 @@ import com.google.gerrit.acceptance.TestAccount; import com.google.gerrit.acceptance.testsuite.project.ProjectOperations; import com.google.gerrit.acceptance.testsuite.request.RequestScopeOperations; import com.google.gerrit.common.data.GlobalCapability; -import com.google.gerrit.common.data.Permission; import com.google.gerrit.entities.Account; +import com.google.gerrit.entities.Permission; import com.google.gerrit.entities.RefNames; import com.google.gerrit.exceptions.DuplicateKeyException; import com.google.gerrit.extensions.api.config.ConsistencyCheckInfo; diff --git a/javatests/com/google/gerrit/acceptance/rest/account/ImpersonationIT.java b/javatests/com/google/gerrit/acceptance/rest/account/ImpersonationIT.java index 00c7fb8808..a11328fef4 100644 --- a/javatests/com/google/gerrit/acceptance/rest/account/ImpersonationIT.java +++ b/javatests/com/google/gerrit/acceptance/rest/account/ImpersonationIT.java @@ -37,13 +37,13 @@ import com.google.gerrit.acceptance.config.GerritConfig; import com.google.gerrit.acceptance.testsuite.project.ProjectOperations; import com.google.gerrit.acceptance.testsuite.request.RequestScopeOperations; import com.google.gerrit.common.data.GlobalCapability; -import com.google.gerrit.common.data.LabelType; -import com.google.gerrit.common.data.Permission; import com.google.gerrit.entities.AccountGroup; import com.google.gerrit.entities.ChangeMessage; import com.google.gerrit.entities.HumanComment; +import com.google.gerrit.entities.LabelType; import com.google.gerrit.entities.Patch; import com.google.gerrit.entities.PatchSetApproval; +import com.google.gerrit.entities.Permission; import com.google.gerrit.entities.RobotComment; import com.google.gerrit.extensions.api.changes.DraftInput; import com.google.gerrit.extensions.api.changes.ReviewInput; diff --git a/javatests/com/google/gerrit/acceptance/rest/binding/ProjectsRestApiBindingsIT.java b/javatests/com/google/gerrit/acceptance/rest/binding/ProjectsRestApiBindingsIT.java index e9f5143bc2..f1c01104e5 100644 --- a/javatests/com/google/gerrit/acceptance/rest/binding/ProjectsRestApiBindingsIT.java +++ b/javatests/com/google/gerrit/acceptance/rest/binding/ProjectsRestApiBindingsIT.java @@ -29,8 +29,8 @@ import com.google.gerrit.acceptance.GitUtil; import com.google.gerrit.acceptance.rest.util.RestApiCallHelper; import com.google.gerrit.acceptance.rest.util.RestCall; import com.google.gerrit.acceptance.testsuite.project.ProjectOperations; -import com.google.gerrit.common.data.LabelFunction; -import com.google.gerrit.common.data.Permission; +import com.google.gerrit.entities.LabelFunction; +import com.google.gerrit.entities.Permission; import com.google.gerrit.entities.Project; import com.google.gerrit.extensions.api.changes.ReviewInput; import com.google.gerrit.extensions.api.projects.BranchInput; diff --git a/javatests/com/google/gerrit/acceptance/rest/change/AbstractSubmit.java b/javatests/com/google/gerrit/acceptance/rest/change/AbstractSubmit.java index 75950e2903..f2699709bc 100644 --- a/javatests/com/google/gerrit/acceptance/rest/change/AbstractSubmit.java +++ b/javatests/com/google/gerrit/acceptance/rest/change/AbstractSubmit.java @@ -55,12 +55,12 @@ import com.google.gerrit.acceptance.config.GerritConfig; import com.google.gerrit.acceptance.testsuite.project.ProjectOperations; import com.google.gerrit.acceptance.testsuite.request.RequestScopeOperations; import com.google.gerrit.common.Nullable; -import com.google.gerrit.common.data.Permission; import com.google.gerrit.entities.Account; import com.google.gerrit.entities.BranchNameKey; import com.google.gerrit.entities.Change; import com.google.gerrit.entities.PatchSet; import com.google.gerrit.entities.PatchSetApproval; +import com.google.gerrit.entities.Permission; import com.google.gerrit.entities.Project; import com.google.gerrit.entities.RefNames; import com.google.gerrit.extensions.api.changes.ChangeApi; diff --git a/javatests/com/google/gerrit/acceptance/rest/change/AbstractSubmitByRebase.java b/javatests/com/google/gerrit/acceptance/rest/change/AbstractSubmitByRebase.java index fff67f3de1..955dd7a16f 100644 --- a/javatests/com/google/gerrit/acceptance/rest/change/AbstractSubmitByRebase.java +++ b/javatests/com/google/gerrit/acceptance/rest/change/AbstractSubmitByRebase.java @@ -28,8 +28,8 @@ import com.google.gerrit.acceptance.TestAccount; import com.google.gerrit.acceptance.TestProjectInput; import com.google.gerrit.acceptance.testsuite.project.ProjectOperations; import com.google.gerrit.acceptance.testsuite.request.RequestScopeOperations; -import com.google.gerrit.common.data.Permission; import com.google.gerrit.entities.BranchNameKey; +import com.google.gerrit.entities.Permission; import com.google.gerrit.entities.Project; import com.google.gerrit.extensions.client.ChangeStatus; import com.google.gerrit.extensions.client.InheritableBoolean; diff --git a/javatests/com/google/gerrit/acceptance/rest/change/AssigneeIT.java b/javatests/com/google/gerrit/acceptance/rest/change/AssigneeIT.java index 2d47dd866a..36cd3cbf11 100644 --- a/javatests/com/google/gerrit/acceptance/rest/change/AssigneeIT.java +++ b/javatests/com/google/gerrit/acceptance/rest/change/AssigneeIT.java @@ -27,7 +27,7 @@ import com.google.gerrit.acceptance.PushOneCommit; import com.google.gerrit.acceptance.UseClockStep; import com.google.gerrit.acceptance.testsuite.project.ProjectOperations; import com.google.gerrit.acceptance.testsuite.request.RequestScopeOperations; -import com.google.gerrit.common.data.Permission; +import com.google.gerrit.entities.Permission; import com.google.gerrit.entities.RefNames; import com.google.gerrit.extensions.api.changes.AssigneeInput; import com.google.gerrit.extensions.client.ReviewerState; diff --git a/javatests/com/google/gerrit/acceptance/rest/change/ChangeIncludedInIT.java b/javatests/com/google/gerrit/acceptance/rest/change/ChangeIncludedInIT.java index 47fb20a43e..dd85cb0de6 100644 --- a/javatests/com/google/gerrit/acceptance/rest/change/ChangeIncludedInIT.java +++ b/javatests/com/google/gerrit/acceptance/rest/change/ChangeIncludedInIT.java @@ -22,8 +22,8 @@ import com.google.gerrit.acceptance.AbstractDaemonTest; import com.google.gerrit.acceptance.NoHttpd; import com.google.gerrit.acceptance.PushOneCommit.Result; import com.google.gerrit.acceptance.testsuite.project.ProjectOperations; -import com.google.gerrit.common.data.Permission; import com.google.gerrit.entities.BranchNameKey; +import com.google.gerrit.entities.Permission; import com.google.gerrit.extensions.api.changes.ReviewInput; import com.google.gerrit.extensions.api.projects.TagInput; import com.google.inject.Inject; diff --git a/javatests/com/google/gerrit/acceptance/rest/change/ChangeReviewersIT.java b/javatests/com/google/gerrit/acceptance/rest/change/ChangeReviewersIT.java index 40b6da4bfd..a6bd5ebfe0 100644 --- a/javatests/com/google/gerrit/acceptance/rest/change/ChangeReviewersIT.java +++ b/javatests/com/google/gerrit/acceptance/rest/change/ChangeReviewersIT.java @@ -36,8 +36,8 @@ import com.google.gerrit.acceptance.TestAccount; import com.google.gerrit.acceptance.testsuite.group.GroupOperations; import com.google.gerrit.acceptance.testsuite.project.ProjectOperations; import com.google.gerrit.acceptance.testsuite.request.RequestScopeOperations; -import com.google.gerrit.common.data.Permission; import com.google.gerrit.entities.Address; +import com.google.gerrit.entities.Permission; import com.google.gerrit.entities.RefNames; import com.google.gerrit.extensions.api.changes.AddReviewerInput; import com.google.gerrit.extensions.api.changes.AddReviewerResult; diff --git a/javatests/com/google/gerrit/acceptance/rest/change/ConfigChangeIT.java b/javatests/com/google/gerrit/acceptance/rest/change/ConfigChangeIT.java index 243991b96c..ed21050715 100644 --- a/javatests/com/google/gerrit/acceptance/rest/change/ConfigChangeIT.java +++ b/javatests/com/google/gerrit/acceptance/rest/change/ConfigChangeIT.java @@ -26,7 +26,7 @@ import com.google.gerrit.acceptance.PushOneCommit; import com.google.gerrit.acceptance.TestProjectInput; import com.google.gerrit.acceptance.testsuite.project.ProjectOperations; import com.google.gerrit.acceptance.testsuite.request.RequestScopeOperations; -import com.google.gerrit.common.data.Permission; +import com.google.gerrit.entities.Permission; import com.google.gerrit.entities.Project; import com.google.gerrit.entities.RefNames; import com.google.gerrit.extensions.api.changes.ReviewInput; diff --git a/javatests/com/google/gerrit/acceptance/rest/change/CreateChangeIT.java b/javatests/com/google/gerrit/acceptance/rest/change/CreateChangeIT.java index 68e9b1424b..7fe2a507ea 100644 --- a/javatests/com/google/gerrit/acceptance/rest/change/CreateChangeIT.java +++ b/javatests/com/google/gerrit/acceptance/rest/change/CreateChangeIT.java @@ -16,7 +16,7 @@ package com.google.gerrit.acceptance.rest.change; import static com.google.common.truth.Truth.assertThat; import static com.google.gerrit.acceptance.testsuite.project.TestProjectUpdate.block; -import static com.google.gerrit.common.data.Permission.READ; +import static com.google.gerrit.entities.Permission.READ; import static com.google.gerrit.entities.RefNames.changeMetaRef; import static com.google.gerrit.extensions.common.testing.GitPersonSubject.assertThat; import static com.google.gerrit.git.ObjectIds.abbreviateName; @@ -36,9 +36,9 @@ import com.google.gerrit.acceptance.UseClockStep; import com.google.gerrit.acceptance.UseSystemTime; import com.google.gerrit.acceptance.testsuite.project.ProjectOperations; import com.google.gerrit.acceptance.testsuite.request.RequestScopeOperations; -import com.google.gerrit.common.data.Permission; import com.google.gerrit.entities.BranchNameKey; import com.google.gerrit.entities.Change; +import com.google.gerrit.entities.Permission; import com.google.gerrit.entities.RefNames; import com.google.gerrit.extensions.api.accounts.AccountInput; import com.google.gerrit.extensions.api.changes.ChangeApi; diff --git a/javatests/com/google/gerrit/acceptance/rest/change/HashtagsIT.java b/javatests/com/google/gerrit/acceptance/rest/change/HashtagsIT.java index 0099fe6446..058a96fa1c 100644 --- a/javatests/com/google/gerrit/acceptance/rest/change/HashtagsIT.java +++ b/javatests/com/google/gerrit/acceptance/rest/change/HashtagsIT.java @@ -30,7 +30,7 @@ import com.google.gerrit.acceptance.PushOneCommit; import com.google.gerrit.acceptance.UseClockStep; import com.google.gerrit.acceptance.testsuite.project.ProjectOperations; import com.google.gerrit.acceptance.testsuite.request.RequestScopeOperations; -import com.google.gerrit.common.data.Permission; +import com.google.gerrit.entities.Permission; import com.google.gerrit.extensions.api.changes.HashtagsInput; import com.google.gerrit.extensions.common.ChangeMessageInfo; import com.google.gerrit.extensions.restapi.AuthException; diff --git a/javatests/com/google/gerrit/acceptance/rest/change/IndexChangeIT.java b/javatests/com/google/gerrit/acceptance/rest/change/IndexChangeIT.java index 61dc4d4c5d..def4ed8647 100644 --- a/javatests/com/google/gerrit/acceptance/rest/change/IndexChangeIT.java +++ b/javatests/com/google/gerrit/acceptance/rest/change/IndexChangeIT.java @@ -26,8 +26,8 @@ import com.google.gerrit.acceptance.config.GerritConfig; import com.google.gerrit.acceptance.testsuite.group.GroupOperations; import com.google.gerrit.acceptance.testsuite.project.ProjectOperations; import com.google.gerrit.acceptance.testsuite.request.RequestScopeOperations; -import com.google.gerrit.common.data.Permission; import com.google.gerrit.entities.AccountGroup; +import com.google.gerrit.entities.Permission; import com.google.gerrit.entities.Project; import com.google.gerrit.extensions.common.ChangeInfo; import com.google.inject.Inject; diff --git a/javatests/com/google/gerrit/acceptance/rest/change/MoveChangeIT.java b/javatests/com/google/gerrit/acceptance/rest/change/MoveChangeIT.java index 542085caf9..d5881ea7a2 100644 --- a/javatests/com/google/gerrit/acceptance/rest/change/MoveChangeIT.java +++ b/javatests/com/google/gerrit/acceptance/rest/change/MoveChangeIT.java @@ -28,10 +28,10 @@ import com.google.gerrit.acceptance.PushOneCommit; import com.google.gerrit.acceptance.config.GerritConfig; import com.google.gerrit.acceptance.testsuite.project.ProjectOperations; import com.google.gerrit.acceptance.testsuite.request.RequestScopeOperations; -import com.google.gerrit.common.data.LabelFunction; -import com.google.gerrit.common.data.LabelType; -import com.google.gerrit.common.data.Permission; import com.google.gerrit.entities.BranchNameKey; +import com.google.gerrit.entities.LabelFunction; +import com.google.gerrit.entities.LabelType; +import com.google.gerrit.entities.Permission; import com.google.gerrit.extensions.api.changes.MoveInput; import com.google.gerrit.extensions.api.changes.ReviewInput; import com.google.gerrit.extensions.api.projects.BranchInput; diff --git a/javatests/com/google/gerrit/acceptance/rest/change/SubmitByFastForwardIT.java b/javatests/com/google/gerrit/acceptance/rest/change/SubmitByFastForwardIT.java index 670cff2c96..1912697699 100644 --- a/javatests/com/google/gerrit/acceptance/rest/change/SubmitByFastForwardIT.java +++ b/javatests/com/google/gerrit/acceptance/rest/change/SubmitByFastForwardIT.java @@ -21,8 +21,8 @@ import static com.google.gerrit.acceptance.testsuite.project.TestProjectUpdate.a import com.google.gerrit.acceptance.GitUtil; import com.google.gerrit.acceptance.PushOneCommit; import com.google.gerrit.acceptance.testsuite.project.ProjectOperations; -import com.google.gerrit.common.data.Permission; import com.google.gerrit.entities.Change; +import com.google.gerrit.entities.Permission; import com.google.gerrit.extensions.client.SubmitType; import com.google.gerrit.extensions.common.ActionInfo; import com.google.inject.Inject; diff --git a/javatests/com/google/gerrit/acceptance/rest/change/SubmitByMergeIfNecessaryIT.java b/javatests/com/google/gerrit/acceptance/rest/change/SubmitByMergeIfNecessaryIT.java index b259d90b54..5fe741d013 100644 --- a/javatests/com/google/gerrit/acceptance/rest/change/SubmitByMergeIfNecessaryIT.java +++ b/javatests/com/google/gerrit/acceptance/rest/change/SubmitByMergeIfNecessaryIT.java @@ -19,7 +19,7 @@ import static com.google.common.truth.TruthJUnit.assume; import static com.google.gerrit.acceptance.testsuite.project.TestProjectUpdate.allow; import static com.google.gerrit.acceptance.testsuite.project.TestProjectUpdate.allowLabel; import static com.google.gerrit.acceptance.testsuite.project.TestProjectUpdate.block; -import static com.google.gerrit.common.data.Permission.READ; +import static com.google.gerrit.entities.Permission.READ; import static com.google.gerrit.server.group.SystemGroupBackend.ANONYMOUS_USERS; import static com.google.gerrit.server.group.SystemGroupBackend.REGISTERED_USERS; import static com.google.gerrit.testing.GerritJUnit.assertThrows; @@ -28,9 +28,9 @@ import com.google.gerrit.acceptance.GitUtil; import com.google.gerrit.acceptance.PushOneCommit; import com.google.gerrit.acceptance.testsuite.project.ProjectOperations; import com.google.gerrit.acceptance.testsuite.request.RequestScopeOperations; -import com.google.gerrit.common.data.Permission; import com.google.gerrit.entities.BranchNameKey; import com.google.gerrit.entities.PatchSet; +import com.google.gerrit.entities.Permission; import com.google.gerrit.entities.Project; import com.google.gerrit.extensions.api.changes.ChangeApi; import com.google.gerrit.extensions.api.changes.CherryPickInput; diff --git a/javatests/com/google/gerrit/acceptance/rest/change/SuggestReviewersIT.java b/javatests/com/google/gerrit/acceptance/rest/change/SuggestReviewersIT.java index 551a34905c..888878fb9a 100644 --- a/javatests/com/google/gerrit/acceptance/rest/change/SuggestReviewersIT.java +++ b/javatests/com/google/gerrit/acceptance/rest/change/SuggestReviewersIT.java @@ -19,7 +19,7 @@ import static com.google.common.truth.Truth.assertThat; import static com.google.gerrit.acceptance.testsuite.project.TestProjectUpdate.allow; import static com.google.gerrit.acceptance.testsuite.project.TestProjectUpdate.allowCapability; import static com.google.gerrit.acceptance.testsuite.project.TestProjectUpdate.block; -import static com.google.gerrit.common.data.Permission.READ; +import static com.google.gerrit.entities.Permission.READ; import static com.google.gerrit.server.group.SystemGroupBackend.ANONYMOUS_USERS; import static com.google.gerrit.testing.GerritJUnit.assertThrows; import static java.util.stream.Collectors.toList; diff --git a/javatests/com/google/gerrit/acceptance/rest/config/IndexChangesIT.java b/javatests/com/google/gerrit/acceptance/rest/config/IndexChangesIT.java index a3c1722982..614ce80042 100644 --- a/javatests/com/google/gerrit/acceptance/rest/config/IndexChangesIT.java +++ b/javatests/com/google/gerrit/acceptance/rest/config/IndexChangesIT.java @@ -24,7 +24,7 @@ import com.google.gerrit.acceptance.ChangeIndexedCounter; import com.google.gerrit.acceptance.ExtensionRegistry; import com.google.gerrit.acceptance.ExtensionRegistry.Registration; import com.google.gerrit.acceptance.testsuite.project.ProjectOperations; -import com.google.gerrit.common.data.Permission; +import com.google.gerrit.entities.Permission; import com.google.gerrit.extensions.common.ChangeInfo; import com.google.gerrit.server.restapi.config.IndexChanges; import com.google.inject.Inject; diff --git a/javatests/com/google/gerrit/acceptance/rest/project/AbstractPushTag.java b/javatests/com/google/gerrit/acceptance/rest/project/AbstractPushTag.java index d70d120c19..191d5c5068 100644 --- a/javatests/com/google/gerrit/acceptance/rest/project/AbstractPushTag.java +++ b/javatests/com/google/gerrit/acceptance/rest/project/AbstractPushTag.java @@ -29,7 +29,7 @@ import com.google.common.base.MoreObjects; import com.google.gerrit.acceptance.AbstractDaemonTest; import com.google.gerrit.acceptance.GitUtil; import com.google.gerrit.acceptance.testsuite.project.ProjectOperations; -import com.google.gerrit.common.data.Permission; +import com.google.gerrit.entities.Permission; import com.google.gerrit.entities.RefNames; import com.google.inject.Inject; import org.eclipse.jgit.lib.PersonIdent; diff --git a/javatests/com/google/gerrit/acceptance/rest/project/AccessIT.java b/javatests/com/google/gerrit/acceptance/rest/project/AccessIT.java index 5f17e8787b..33d0d29086 100644 --- a/javatests/com/google/gerrit/acceptance/rest/project/AccessIT.java +++ b/javatests/com/google/gerrit/acceptance/rest/project/AccessIT.java @@ -31,10 +31,10 @@ import com.google.gerrit.acceptance.GitUtil; import com.google.gerrit.acceptance.PushOneCommit; import com.google.gerrit.acceptance.testsuite.project.ProjectOperations; import com.google.gerrit.acceptance.testsuite.request.RequestScopeOperations; -import com.google.gerrit.common.data.AccessSection; import com.google.gerrit.common.data.GlobalCapability; -import com.google.gerrit.common.data.Permission; +import com.google.gerrit.entities.AccessSection; import com.google.gerrit.entities.GroupReference; +import com.google.gerrit.entities.Permission; import com.google.gerrit.entities.Project; import com.google.gerrit.entities.RefNames; import com.google.gerrit.extensions.api.access.AccessSectionInfo; diff --git a/javatests/com/google/gerrit/acceptance/rest/project/BUILD b/javatests/com/google/gerrit/acceptance/rest/project/BUILD index 54ae5af44f..5e1fc831e0 100644 --- a/javatests/com/google/gerrit/acceptance/rest/project/BUILD +++ b/javatests/com/google/gerrit/acceptance/rest/project/BUILD @@ -21,6 +21,7 @@ java_library( ], deps = [ "//java/com/google/gerrit/common:server", + "//java/com/google/gerrit/entities", "//java/com/google/gerrit/extensions:api", "//java/com/google/gerrit/server", "//lib/truth", diff --git a/javatests/com/google/gerrit/acceptance/rest/project/CreateBranchIT.java b/javatests/com/google/gerrit/acceptance/rest/project/CreateBranchIT.java index b01a07bf51..096c72b0fd 100644 --- a/javatests/com/google/gerrit/acceptance/rest/project/CreateBranchIT.java +++ b/javatests/com/google/gerrit/acceptance/rest/project/CreateBranchIT.java @@ -29,10 +29,10 @@ import com.google.gerrit.acceptance.ExtensionRegistry; import com.google.gerrit.acceptance.RestResponse; import com.google.gerrit.acceptance.testsuite.project.ProjectOperations; import com.google.gerrit.acceptance.testsuite.request.RequestScopeOperations; -import com.google.gerrit.common.data.Permission; import com.google.gerrit.entities.Account; import com.google.gerrit.entities.AccountGroup; import com.google.gerrit.entities.BranchNameKey; +import com.google.gerrit.entities.Permission; import com.google.gerrit.entities.RefNames; import com.google.gerrit.extensions.api.projects.BranchApi; import com.google.gerrit.extensions.api.projects.BranchInfo; diff --git a/javatests/com/google/gerrit/acceptance/rest/project/CreateLabelIT.java b/javatests/com/google/gerrit/acceptance/rest/project/CreateLabelIT.java index e5587a9815..94511f8943 100644 --- a/javatests/com/google/gerrit/acceptance/rest/project/CreateLabelIT.java +++ b/javatests/com/google/gerrit/acceptance/rest/project/CreateLabelIT.java @@ -25,8 +25,8 @@ import com.google.gerrit.acceptance.AbstractDaemonTest; import com.google.gerrit.acceptance.NoHttpd; import com.google.gerrit.acceptance.testsuite.project.ProjectOperations; import com.google.gerrit.acceptance.testsuite.request.RequestScopeOperations; -import com.google.gerrit.common.data.LabelFunction; -import com.google.gerrit.common.data.Permission; +import com.google.gerrit.entities.LabelFunction; +import com.google.gerrit.entities.Permission; import com.google.gerrit.entities.RefNames; import com.google.gerrit.extensions.common.LabelDefinitionInfo; import com.google.gerrit.extensions.common.LabelDefinitionInput; diff --git a/javatests/com/google/gerrit/acceptance/rest/project/DeleteBranchIT.java b/javatests/com/google/gerrit/acceptance/rest/project/DeleteBranchIT.java index 5636014f91..c98a58ec65 100644 --- a/javatests/com/google/gerrit/acceptance/rest/project/DeleteBranchIT.java +++ b/javatests/com/google/gerrit/acceptance/rest/project/DeleteBranchIT.java @@ -26,8 +26,8 @@ import com.google.gerrit.acceptance.AbstractDaemonTest; import com.google.gerrit.acceptance.RestResponse; import com.google.gerrit.acceptance.testsuite.project.ProjectOperations; import com.google.gerrit.acceptance.testsuite.request.RequestScopeOperations; -import com.google.gerrit.common.data.Permission; import com.google.gerrit.entities.BranchNameKey; +import com.google.gerrit.entities.Permission; import com.google.gerrit.entities.RefNames; import com.google.gerrit.extensions.api.projects.BranchApi; import com.google.gerrit.extensions.api.projects.BranchInput; diff --git a/javatests/com/google/gerrit/acceptance/rest/project/DeleteBranchesIT.java b/javatests/com/google/gerrit/acceptance/rest/project/DeleteBranchesIT.java index ad90109642..98fc020bfa 100644 --- a/javatests/com/google/gerrit/acceptance/rest/project/DeleteBranchesIT.java +++ b/javatests/com/google/gerrit/acceptance/rest/project/DeleteBranchesIT.java @@ -28,7 +28,7 @@ import com.google.gerrit.acceptance.AbstractDaemonTest; import com.google.gerrit.acceptance.NoHttpd; import com.google.gerrit.acceptance.testsuite.project.ProjectOperations; import com.google.gerrit.acceptance.testsuite.request.RequestScopeOperations; -import com.google.gerrit.common.data.Permission; +import com.google.gerrit.entities.Permission; import com.google.gerrit.entities.RefNames; import com.google.gerrit.extensions.api.projects.BranchInput; import com.google.gerrit.extensions.api.projects.DeleteBranchesInput; diff --git a/javatests/com/google/gerrit/acceptance/rest/project/DeleteLabelIT.java b/javatests/com/google/gerrit/acceptance/rest/project/DeleteLabelIT.java index c916285a70..57c7b17319 100644 --- a/javatests/com/google/gerrit/acceptance/rest/project/DeleteLabelIT.java +++ b/javatests/com/google/gerrit/acceptance/rest/project/DeleteLabelIT.java @@ -22,7 +22,7 @@ import static com.google.gerrit.testing.GerritJUnit.assertThrows; import com.google.gerrit.acceptance.AbstractDaemonTest; import com.google.gerrit.acceptance.testsuite.project.ProjectOperations; import com.google.gerrit.acceptance.testsuite.request.RequestScopeOperations; -import com.google.gerrit.common.data.Permission; +import com.google.gerrit.entities.Permission; import com.google.gerrit.entities.RefNames; import com.google.gerrit.extensions.restapi.AuthException; import com.google.gerrit.extensions.restapi.ResourceNotFoundException; diff --git a/javatests/com/google/gerrit/acceptance/rest/project/DeleteTagIT.java b/javatests/com/google/gerrit/acceptance/rest/project/DeleteTagIT.java index 9770031200..7e60395de5 100644 --- a/javatests/com/google/gerrit/acceptance/rest/project/DeleteTagIT.java +++ b/javatests/com/google/gerrit/acceptance/rest/project/DeleteTagIT.java @@ -26,7 +26,7 @@ import com.google.gerrit.acceptance.AbstractDaemonTest; import com.google.gerrit.acceptance.RestResponse; import com.google.gerrit.acceptance.testsuite.project.ProjectOperations; import com.google.gerrit.acceptance.testsuite.request.RequestScopeOperations; -import com.google.gerrit.common.data.Permission; +import com.google.gerrit.entities.Permission; import com.google.gerrit.extensions.api.projects.TagApi; import com.google.gerrit.extensions.api.projects.TagInfo; import com.google.gerrit.extensions.api.projects.TagInput; diff --git a/javatests/com/google/gerrit/acceptance/rest/project/GetCommitIT.java b/javatests/com/google/gerrit/acceptance/rest/project/GetCommitIT.java index 1b1a36de36..5bd0e25299 100644 --- a/javatests/com/google/gerrit/acceptance/rest/project/GetCommitIT.java +++ b/javatests/com/google/gerrit/acceptance/rest/project/GetCommitIT.java @@ -24,7 +24,7 @@ import com.google.gerrit.acceptance.GitUtil; import com.google.gerrit.acceptance.PushOneCommit; import com.google.gerrit.acceptance.RestResponse; import com.google.gerrit.acceptance.testsuite.project.ProjectOperations; -import com.google.gerrit.common.data.Permission; +import com.google.gerrit.entities.Permission; import com.google.gerrit.extensions.common.CommitInfo; import com.google.inject.Inject; import org.eclipse.jgit.junit.TestRepository; diff --git a/javatests/com/google/gerrit/acceptance/rest/project/GetLabelIT.java b/javatests/com/google/gerrit/acceptance/rest/project/GetLabelIT.java index 3e35f04612..a2c5c64a83 100644 --- a/javatests/com/google/gerrit/acceptance/rest/project/GetLabelIT.java +++ b/javatests/com/google/gerrit/acceptance/rest/project/GetLabelIT.java @@ -21,7 +21,7 @@ import com.google.common.collect.ImmutableList; import com.google.gerrit.acceptance.AbstractDaemonTest; import com.google.gerrit.acceptance.NoHttpd; import com.google.gerrit.acceptance.testsuite.request.RequestScopeOperations; -import com.google.gerrit.common.data.LabelFunction; +import com.google.gerrit.entities.LabelFunction; import com.google.gerrit.extensions.common.LabelDefinitionInfo; import com.google.gerrit.extensions.restapi.AuthException; import com.google.gerrit.extensions.restapi.ResourceNotFoundException; diff --git a/javatests/com/google/gerrit/acceptance/rest/project/LabelAssert.java b/javatests/com/google/gerrit/acceptance/rest/project/LabelAssert.java index 65e352bcf2..201bb532b2 100644 --- a/javatests/com/google/gerrit/acceptance/rest/project/LabelAssert.java +++ b/javatests/com/google/gerrit/acceptance/rest/project/LabelAssert.java @@ -16,7 +16,7 @@ package com.google.gerrit.acceptance.rest.project; import static com.google.common.truth.Truth.assertThat; -import com.google.gerrit.common.data.LabelFunction; +import com.google.gerrit.entities.LabelFunction; import com.google.gerrit.extensions.common.LabelDefinitionInfo; import com.google.gerrit.server.config.AllProjectsNameProvider; diff --git a/javatests/com/google/gerrit/acceptance/rest/project/ListBranchesIT.java b/javatests/com/google/gerrit/acceptance/rest/project/ListBranchesIT.java index 91a2c4bd83..f8be28b411 100644 --- a/javatests/com/google/gerrit/acceptance/rest/project/ListBranchesIT.java +++ b/javatests/com/google/gerrit/acceptance/rest/project/ListBranchesIT.java @@ -25,7 +25,7 @@ import com.google.gerrit.acceptance.NoHttpd; import com.google.gerrit.acceptance.TestProjectInput; import com.google.gerrit.acceptance.testsuite.project.ProjectOperations; import com.google.gerrit.acceptance.testsuite.request.RequestScopeOperations; -import com.google.gerrit.common.data.Permission; +import com.google.gerrit.entities.Permission; import com.google.gerrit.entities.RefNames; import com.google.gerrit.extensions.api.projects.BranchInfo; import com.google.gerrit.extensions.api.projects.ProjectApi.ListRefsRequest; diff --git a/javatests/com/google/gerrit/acceptance/rest/project/ListLabelsIT.java b/javatests/com/google/gerrit/acceptance/rest/project/ListLabelsIT.java index 33a065405c..d39c96eb4f 100644 --- a/javatests/com/google/gerrit/acceptance/rest/project/ListLabelsIT.java +++ b/javatests/com/google/gerrit/acceptance/rest/project/ListLabelsIT.java @@ -26,8 +26,8 @@ import com.google.gerrit.acceptance.AbstractDaemonTest; import com.google.gerrit.acceptance.NoHttpd; import com.google.gerrit.acceptance.testsuite.project.ProjectOperations; import com.google.gerrit.acceptance.testsuite.request.RequestScopeOperations; -import com.google.gerrit.common.data.LabelFunction; -import com.google.gerrit.common.data.Permission; +import com.google.gerrit.entities.LabelFunction; +import com.google.gerrit.entities.Permission; import com.google.gerrit.entities.Project; import com.google.gerrit.entities.RefNames; import com.google.gerrit.extensions.common.LabelDefinitionInfo; diff --git a/javatests/com/google/gerrit/acceptance/rest/project/ListProjectsIT.java b/javatests/com/google/gerrit/acceptance/rest/project/ListProjectsIT.java index bb08267d31..2e274d9289 100644 --- a/javatests/com/google/gerrit/acceptance/rest/project/ListProjectsIT.java +++ b/javatests/com/google/gerrit/acceptance/rest/project/ListProjectsIT.java @@ -32,7 +32,7 @@ import com.google.gerrit.acceptance.TestProjectInput; import com.google.gerrit.acceptance.config.GerritConfig; import com.google.gerrit.acceptance.testsuite.project.ProjectOperations; import com.google.gerrit.acceptance.testsuite.request.RequestScopeOperations; -import com.google.gerrit.common.data.Permission; +import com.google.gerrit.entities.Permission; import com.google.gerrit.entities.Project; import com.google.gerrit.extensions.api.projects.ConfigInfo; import com.google.gerrit.extensions.api.projects.ConfigInput; diff --git a/javatests/com/google/gerrit/acceptance/rest/project/PluginAccessIT.java b/javatests/com/google/gerrit/acceptance/rest/project/PluginAccessIT.java index e7663f7fd5..93b1f126b8 100644 --- a/javatests/com/google/gerrit/acceptance/rest/project/PluginAccessIT.java +++ b/javatests/com/google/gerrit/acceptance/rest/project/PluginAccessIT.java @@ -18,7 +18,7 @@ import static com.google.common.truth.Truth.assertThat; import com.google.common.collect.ImmutableMap; import com.google.gerrit.acceptance.AbstractDaemonTest; -import com.google.gerrit.common.data.AccessSection; +import com.google.gerrit.entities.AccessSection; import com.google.gerrit.extensions.annotations.Exports; import com.google.gerrit.extensions.api.access.AccessSectionInfo; import com.google.gerrit.extensions.api.access.PermissionInfo; diff --git a/javatests/com/google/gerrit/acceptance/rest/project/PostLabelsIT.java b/javatests/com/google/gerrit/acceptance/rest/project/PostLabelsIT.java index 9e6b051543..ba52024b95 100644 --- a/javatests/com/google/gerrit/acceptance/rest/project/PostLabelsIT.java +++ b/javatests/com/google/gerrit/acceptance/rest/project/PostLabelsIT.java @@ -24,8 +24,8 @@ import com.google.common.collect.ImmutableMap; import com.google.gerrit.acceptance.AbstractDaemonTest; import com.google.gerrit.acceptance.testsuite.project.ProjectOperations; import com.google.gerrit.acceptance.testsuite.request.RequestScopeOperations; -import com.google.gerrit.common.data.LabelFunction; -import com.google.gerrit.common.data.Permission; +import com.google.gerrit.entities.LabelFunction; +import com.google.gerrit.entities.Permission; import com.google.gerrit.entities.RefNames; import com.google.gerrit.extensions.common.BatchLabelInput; import com.google.gerrit.extensions.common.LabelDefinitionInfo; diff --git a/javatests/com/google/gerrit/acceptance/rest/project/SetLabelIT.java b/javatests/com/google/gerrit/acceptance/rest/project/SetLabelIT.java index a1817d946c..1e8d978dbd 100644 --- a/javatests/com/google/gerrit/acceptance/rest/project/SetLabelIT.java +++ b/javatests/com/google/gerrit/acceptance/rest/project/SetLabelIT.java @@ -25,8 +25,8 @@ import com.google.gerrit.acceptance.AbstractDaemonTest; import com.google.gerrit.acceptance.NoHttpd; import com.google.gerrit.acceptance.testsuite.project.ProjectOperations; import com.google.gerrit.acceptance.testsuite.request.RequestScopeOperations; -import com.google.gerrit.common.data.LabelFunction; -import com.google.gerrit.common.data.Permission; +import com.google.gerrit.entities.LabelFunction; +import com.google.gerrit.entities.Permission; import com.google.gerrit.entities.RefNames; import com.google.gerrit.extensions.common.LabelDefinitionInfo; import com.google.gerrit.extensions.common.LabelDefinitionInput; diff --git a/javatests/com/google/gerrit/acceptance/rest/project/TagsIT.java b/javatests/com/google/gerrit/acceptance/rest/project/TagsIT.java index 3d3865a2c0..b1879f65b2 100644 --- a/javatests/com/google/gerrit/acceptance/rest/project/TagsIT.java +++ b/javatests/com/google/gerrit/acceptance/rest/project/TagsIT.java @@ -28,8 +28,8 @@ import com.google.gerrit.acceptance.NoHttpd; import com.google.gerrit.acceptance.PushOneCommit; import com.google.gerrit.acceptance.testsuite.project.ProjectOperations; import com.google.gerrit.acceptance.testsuite.request.RequestScopeOperations; -import com.google.gerrit.common.data.AccessSection; -import com.google.gerrit.common.data.Permission; +import com.google.gerrit.entities.AccessSection; +import com.google.gerrit.entities.Permission; import com.google.gerrit.extensions.api.projects.ProjectApi.ListRefsRequest; import com.google.gerrit.extensions.api.projects.TagApi; import com.google.gerrit.extensions.api.projects.TagInfo; diff --git a/javatests/com/google/gerrit/acceptance/server/event/CommentAddedEventIT.java b/javatests/com/google/gerrit/acceptance/server/event/CommentAddedEventIT.java index 17eb534607..002b860545 100644 --- a/javatests/com/google/gerrit/acceptance/server/event/CommentAddedEventIT.java +++ b/javatests/com/google/gerrit/acceptance/server/event/CommentAddedEventIT.java @@ -27,7 +27,7 @@ import com.google.gerrit.acceptance.ExtensionRegistry.Registration; import com.google.gerrit.acceptance.NoHttpd; import com.google.gerrit.acceptance.PushOneCommit; import com.google.gerrit.acceptance.testsuite.project.ProjectOperations; -import com.google.gerrit.common.data.LabelType; +import com.google.gerrit.entities.LabelType; import com.google.gerrit.extensions.api.changes.ReviewInput; import com.google.gerrit.extensions.common.ApprovalInfo; import com.google.gerrit.extensions.common.ChangeInfo; diff --git a/javatests/com/google/gerrit/acceptance/server/mail/ChangeNotificationsIT.java b/javatests/com/google/gerrit/acceptance/server/mail/ChangeNotificationsIT.java index 70d8335684..9b12f29049 100644 --- a/javatests/com/google/gerrit/acceptance/server/mail/ChangeNotificationsIT.java +++ b/javatests/com/google/gerrit/acceptance/server/mail/ChangeNotificationsIT.java @@ -37,7 +37,7 @@ import com.google.gerrit.acceptance.TestAccount; import com.google.gerrit.acceptance.testsuite.project.ProjectOperations; import com.google.gerrit.acceptance.testsuite.request.RequestScopeOperations; import com.google.gerrit.common.Nullable; -import com.google.gerrit.common.data.Permission; +import com.google.gerrit.entities.Permission; import com.google.gerrit.entities.Project; import com.google.gerrit.extensions.api.changes.AbandonInput; import com.google.gerrit.extensions.api.changes.AddReviewerInput; diff --git a/javatests/com/google/gerrit/acceptance/server/project/CustomLabelIT.java b/javatests/com/google/gerrit/acceptance/server/project/CustomLabelIT.java index 1991e79710..df5bfcaf90 100644 --- a/javatests/com/google/gerrit/acceptance/server/project/CustomLabelIT.java +++ b/javatests/com/google/gerrit/acceptance/server/project/CustomLabelIT.java @@ -17,11 +17,11 @@ package com.google.gerrit.acceptance.server.project; import static com.google.common.truth.Truth.assertThat; import static com.google.gerrit.acceptance.testsuite.project.TestProjectUpdate.allowLabel; import static com.google.gerrit.acceptance.testsuite.project.TestProjectUpdate.labelPermissionKey; -import static com.google.gerrit.common.data.LabelFunction.ANY_WITH_BLOCK; -import static com.google.gerrit.common.data.LabelFunction.MAX_NO_BLOCK; -import static com.google.gerrit.common.data.LabelFunction.MAX_WITH_BLOCK; -import static com.google.gerrit.common.data.LabelFunction.NO_BLOCK; -import static com.google.gerrit.common.data.LabelFunction.NO_OP; +import static com.google.gerrit.entities.LabelFunction.ANY_WITH_BLOCK; +import static com.google.gerrit.entities.LabelFunction.MAX_NO_BLOCK; +import static com.google.gerrit.entities.LabelFunction.MAX_WITH_BLOCK; +import static com.google.gerrit.entities.LabelFunction.NO_BLOCK; +import static com.google.gerrit.entities.LabelFunction.NO_OP; import static com.google.gerrit.extensions.client.ListChangesOption.DETAILED_LABELS; import static com.google.gerrit.extensions.client.ListChangesOption.LABELS; import static com.google.gerrit.extensions.client.ListChangesOption.SUBMITTABLE; @@ -39,15 +39,15 @@ import com.google.gerrit.acceptance.ExtensionRegistry.Registration; import com.google.gerrit.acceptance.NoHttpd; import com.google.gerrit.acceptance.PushOneCommit; import com.google.gerrit.acceptance.testsuite.project.ProjectOperations; -import com.google.gerrit.common.data.LabelFunction; -import com.google.gerrit.common.data.LabelType; +import com.google.gerrit.entities.CachedProjectConfig; +import com.google.gerrit.entities.LabelFunction; +import com.google.gerrit.entities.LabelType; import com.google.gerrit.extensions.api.changes.AddReviewerInput; import com.google.gerrit.extensions.api.changes.ReviewInput; import com.google.gerrit.extensions.common.ChangeInfo; import com.google.gerrit.extensions.common.LabelInfo; import com.google.gerrit.extensions.events.CommentAddedListener; import com.google.gerrit.extensions.restapi.ResourceConflictException; -import com.google.gerrit.server.project.CachedProjectConfig; import com.google.inject.Inject; import org.junit.Before; import org.junit.Test; diff --git a/javatests/com/google/gerrit/acceptance/server/project/ProjectWatchIT.java b/javatests/com/google/gerrit/acceptance/server/project/ProjectWatchIT.java index b04ae33b57..33276e7feb 100644 --- a/javatests/com/google/gerrit/acceptance/server/project/ProjectWatchIT.java +++ b/javatests/com/google/gerrit/acceptance/server/project/ProjectWatchIT.java @@ -25,11 +25,11 @@ import com.google.gerrit.acceptance.PushOneCommit; import com.google.gerrit.acceptance.TestAccount; import com.google.gerrit.acceptance.testsuite.project.ProjectOperations; import com.google.gerrit.acceptance.testsuite.request.RequestScopeOperations; -import com.google.gerrit.common.data.Permission; import com.google.gerrit.entities.AccountGroup; import com.google.gerrit.entities.Address; import com.google.gerrit.entities.NotifyConfig; import com.google.gerrit.entities.NotifyConfig.NotifyType; +import com.google.gerrit.entities.Permission; import com.google.gerrit.entities.Project; import com.google.gerrit.extensions.api.changes.ReviewInput; import com.google.gerrit.extensions.api.changes.StarsInput; diff --git a/javatests/com/google/gerrit/acceptance/server/project/ReflogIT.java b/javatests/com/google/gerrit/acceptance/server/project/ReflogIT.java index 11d39b445d..127f34b3ff 100644 --- a/javatests/com/google/gerrit/acceptance/server/project/ReflogIT.java +++ b/javatests/com/google/gerrit/acceptance/server/project/ReflogIT.java @@ -25,9 +25,9 @@ import com.google.gerrit.acceptance.PushOneCommit; import com.google.gerrit.acceptance.UseLocalDisk; import com.google.gerrit.acceptance.testsuite.project.ProjectOperations; import com.google.gerrit.acceptance.testsuite.request.RequestScopeOperations; -import com.google.gerrit.common.data.Permission; import com.google.gerrit.entities.AccountGroup; import com.google.gerrit.entities.Change; +import com.google.gerrit.entities.Permission; import com.google.gerrit.extensions.api.changes.ReviewInput; import com.google.gerrit.extensions.api.groups.GroupApi; import com.google.gerrit.extensions.api.projects.BranchApi; diff --git a/javatests/com/google/gerrit/acceptance/server/rules/IgnoreSelfApprovalRuleIT.java b/javatests/com/google/gerrit/acceptance/server/rules/IgnoreSelfApprovalRuleIT.java index 90d4e0937f..d3b40cc6bf 100644 --- a/javatests/com/google/gerrit/acceptance/server/rules/IgnoreSelfApprovalRuleIT.java +++ b/javatests/com/google/gerrit/acceptance/server/rules/IgnoreSelfApprovalRuleIT.java @@ -20,9 +20,9 @@ import static com.google.common.truth.Truth8.assertThat; import com.google.gerrit.acceptance.AbstractDaemonTest; import com.google.gerrit.acceptance.NoHttpd; import com.google.gerrit.acceptance.PushOneCommit; -import com.google.gerrit.common.data.LabelType; -import com.google.gerrit.common.data.SubmitRecord; -import com.google.gerrit.common.data.SubmitRequirement; +import com.google.gerrit.entities.LabelType; +import com.google.gerrit.entities.SubmitRecord; +import com.google.gerrit.entities.SubmitRequirement; import com.google.gerrit.server.rules.IgnoreSelfApprovalRule; import com.google.inject.Inject; import java.util.Map; diff --git a/javatests/com/google/gerrit/acceptance/server/rules/PrologRuleEvaluatorIT.java b/javatests/com/google/gerrit/acceptance/server/rules/PrologRuleEvaluatorIT.java index 92cc396e4f..607938859b 100644 --- a/javatests/com/google/gerrit/acceptance/server/rules/PrologRuleEvaluatorIT.java +++ b/javatests/com/google/gerrit/acceptance/server/rules/PrologRuleEvaluatorIT.java @@ -19,8 +19,8 @@ import static com.google.common.truth.Truth.assertThat; import com.google.common.collect.ImmutableList; import com.google.gerrit.acceptance.AbstractDaemonTest; import com.google.gerrit.acceptance.TestAccount; -import com.google.gerrit.common.data.SubmitRecord; import com.google.gerrit.entities.Change; +import com.google.gerrit.entities.SubmitRecord; import com.google.gerrit.server.query.change.ChangeData; import com.google.gerrit.server.rules.PrologOptions; import com.google.gerrit.server.rules.PrologRuleEvaluator; diff --git a/javatests/com/google/gerrit/acceptance/server/rules/RulesIT.java b/javatests/com/google/gerrit/acceptance/server/rules/RulesIT.java index 18ae6c4112..c2a4c2102f 100644 --- a/javatests/com/google/gerrit/acceptance/server/rules/RulesIT.java +++ b/javatests/com/google/gerrit/acceptance/server/rules/RulesIT.java @@ -20,8 +20,8 @@ import com.google.gerrit.acceptance.AbstractDaemonTest; import com.google.gerrit.acceptance.NoHttpd; import com.google.gerrit.acceptance.PushOneCommit; import com.google.gerrit.acceptance.testsuite.project.ProjectOperations; -import com.google.gerrit.common.data.SubmitRecord; import com.google.gerrit.entities.RefNames; +import com.google.gerrit.entities.SubmitRecord; import com.google.gerrit.server.project.SubmitRuleEvaluator; import com.google.gerrit.server.project.SubmitRuleOptions; import com.google.gerrit.server.query.change.ChangeData; diff --git a/javatests/com/google/gerrit/acceptance/testsuite/project/ProjectOperationsImplTest.java b/javatests/com/google/gerrit/acceptance/testsuite/project/ProjectOperationsImplTest.java index 3e8c017f0b..41c65ce54a 100644 --- a/javatests/com/google/gerrit/acceptance/testsuite/project/ProjectOperationsImplTest.java +++ b/javatests/com/google/gerrit/acceptance/testsuite/project/ProjectOperationsImplTest.java @@ -39,7 +39,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableListMultimap; import com.google.gerrit.acceptance.AbstractDaemonTest; import com.google.gerrit.acceptance.testsuite.project.TestProjectUpdate.TestPermission; -import com.google.gerrit.common.data.Permission; +import com.google.gerrit.entities.Permission; import com.google.gerrit.entities.Project; import com.google.gerrit.extensions.api.projects.BranchInfo; import com.google.gerrit.extensions.api.projects.ConfigInput; diff --git a/javatests/com/google/gerrit/acceptance/testsuite/project/TestProjectUpdateTest.java b/javatests/com/google/gerrit/acceptance/testsuite/project/TestProjectUpdateTest.java index 8fc1677e78..e0d0d25bcd 100644 --- a/javatests/com/google/gerrit/acceptance/testsuite/project/TestProjectUpdateTest.java +++ b/javatests/com/google/gerrit/acceptance/testsuite/project/TestProjectUpdateTest.java @@ -26,7 +26,7 @@ import static com.google.gerrit.common.data.GlobalCapability.BATCH_CHANGES_LIMIT import static com.google.gerrit.common.data.GlobalCapability.DEFAULT_MAX_BATCH_CHANGES_LIMIT; import static com.google.gerrit.common.data.GlobalCapability.DEFAULT_MAX_QUERY_LIMIT; import static com.google.gerrit.common.data.GlobalCapability.QUERY_LIMIT; -import static com.google.gerrit.common.data.Permission.ABANDON; +import static com.google.gerrit.entities.Permission.ABANDON; import static com.google.gerrit.server.group.SystemGroupBackend.REGISTERED_USERS; import static com.google.gerrit.testing.GerritJUnit.assertThrows; diff --git a/javatests/com/google/gerrit/common/data/AccessSectionTest.java b/javatests/com/google/gerrit/entities/AccessSectionTest.java similarity index 99% rename from javatests/com/google/gerrit/common/data/AccessSectionTest.java rename to javatests/com/google/gerrit/entities/AccessSectionTest.java index f60156c83e..06860b0a73 100644 --- a/javatests/com/google/gerrit/common/data/AccessSectionTest.java +++ b/javatests/com/google/gerrit/entities/AccessSectionTest.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.common.data; +package com.google.gerrit.entities; import static com.google.common.truth.Truth.assertThat; import static com.google.gerrit.testing.GerritJUnit.assertThrows; diff --git a/javatests/com/google/gerrit/common/data/LabelFunctionTest.java b/javatests/com/google/gerrit/entities/LabelFunctionTest.java similarity index 94% rename from javatests/com/google/gerrit/common/data/LabelFunctionTest.java rename to javatests/com/google/gerrit/entities/LabelFunctionTest.java index 298ce1e5b6..3941564a4d 100644 --- a/javatests/com/google/gerrit/common/data/LabelFunctionTest.java +++ b/javatests/com/google/gerrit/entities/LabelFunctionTest.java @@ -12,17 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.common.data; +package com.google.gerrit.entities; import static com.google.common.truth.Truth.assertThat; import com.google.common.collect.ImmutableList; -import com.google.gerrit.entities.Account; -import com.google.gerrit.entities.Change; -import com.google.gerrit.entities.LabelId; -import com.google.gerrit.entities.LabelValue; -import com.google.gerrit.entities.PatchSet; -import com.google.gerrit.entities.PatchSetApproval; import java.time.Instant; import java.util.ArrayList; import java.util.Date; diff --git a/javatests/com/google/gerrit/common/data/LabelTypeTest.java b/javatests/com/google/gerrit/entities/LabelTypeTest.java similarity index 96% rename from javatests/com/google/gerrit/common/data/LabelTypeTest.java rename to javatests/com/google/gerrit/entities/LabelTypeTest.java index 4810f58608..f31f2c94df 100644 --- a/javatests/com/google/gerrit/common/data/LabelTypeTest.java +++ b/javatests/com/google/gerrit/entities/LabelTypeTest.java @@ -12,12 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.common.data; +package com.google.gerrit.entities; import static com.google.common.truth.Truth.assertThat; import com.google.common.collect.ImmutableList; -import com.google.gerrit.entities.LabelValue; import org.junit.Test; public class LabelTypeTest { diff --git a/javatests/com/google/gerrit/common/data/PermissionRuleTest.java b/javatests/com/google/gerrit/entities/PermissionRuleTest.java similarity index 98% rename from javatests/com/google/gerrit/common/data/PermissionRuleTest.java rename to javatests/com/google/gerrit/entities/PermissionRuleTest.java index ee6590ad6d..c2ed93f8a2 100644 --- a/javatests/com/google/gerrit/common/data/PermissionRuleTest.java +++ b/javatests/com/google/gerrit/entities/PermissionRuleTest.java @@ -12,13 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.common.data; +package com.google.gerrit.entities; import static com.google.common.truth.Truth.assertThat; -import com.google.gerrit.common.data.PermissionRule.Action; -import com.google.gerrit.entities.AccountGroup; -import com.google.gerrit.entities.GroupReference; +import com.google.gerrit.entities.PermissionRule.Action; import org.junit.Before; import org.junit.Test; diff --git a/javatests/com/google/gerrit/common/data/PermissionTest.java b/javatests/com/google/gerrit/entities/PermissionTest.java similarity index 98% rename from javatests/com/google/gerrit/common/data/PermissionTest.java rename to javatests/com/google/gerrit/entities/PermissionTest.java index ac3e2c5e16..2915f79911 100644 --- a/javatests/com/google/gerrit/common/data/PermissionTest.java +++ b/javatests/com/google/gerrit/entities/PermissionTest.java @@ -12,12 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.common.data; +package com.google.gerrit.entities; import static com.google.common.truth.Truth.assertThat; -import com.google.gerrit.entities.AccountGroup; -import com.google.gerrit.entities.GroupReference; import org.junit.Before; import org.junit.Test; diff --git a/javatests/com/google/gerrit/common/data/SubmitRecordTest.java b/javatests/com/google/gerrit/entities/SubmitRecordTest.java similarity index 98% rename from javatests/com/google/gerrit/common/data/SubmitRecordTest.java rename to javatests/com/google/gerrit/entities/SubmitRecordTest.java index 5386b873e6..0e832f415a 100644 --- a/javatests/com/google/gerrit/common/data/SubmitRecordTest.java +++ b/javatests/com/google/gerrit/entities/SubmitRecordTest.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.common.data; +package com.google.gerrit.entities; import static com.google.common.truth.Truth.assertThat; diff --git a/javatests/com/google/gerrit/integration/git/GitProtocolV2IT.java b/javatests/com/google/gerrit/integration/git/GitProtocolV2IT.java index 8577c16faa..76ce956680 100644 --- a/javatests/com/google/gerrit/integration/git/GitProtocolV2IT.java +++ b/javatests/com/google/gerrit/integration/git/GitProtocolV2IT.java @@ -28,9 +28,9 @@ import com.google.gerrit.acceptance.StandaloneSiteTest; import com.google.gerrit.acceptance.TestAccount; import com.google.gerrit.acceptance.UseSsh; import com.google.gerrit.acceptance.testsuite.project.ProjectOperations; -import com.google.gerrit.common.data.Permission; import com.google.gerrit.entities.Change; import com.google.gerrit.entities.PatchSet; +import com.google.gerrit.entities.Permission; import com.google.gerrit.entities.Project; import com.google.gerrit.entities.RefNames; import com.google.gerrit.extensions.api.GerritApi; diff --git a/javatests/com/google/gerrit/server/cache/serialize/entities/AccessSectionSerializerTest.java b/javatests/com/google/gerrit/server/cache/serialize/entities/AccessSectionSerializerTest.java index 660b9e6cbe..40a8105b04 100644 --- a/javatests/com/google/gerrit/server/cache/serialize/entities/AccessSectionSerializerTest.java +++ b/javatests/com/google/gerrit/server/cache/serialize/entities/AccessSectionSerializerTest.java @@ -18,17 +18,18 @@ import static com.google.common.truth.Truth.assertThat; import static com.google.gerrit.server.cache.serialize.entities.AccessSectionSerializer.deserialize; import static com.google.gerrit.server.cache.serialize.entities.AccessSectionSerializer.serialize; -import com.google.gerrit.common.data.AccessSection; +import com.google.gerrit.entities.AccessSection; import org.junit.Test; public class AccessSectionSerializerTest { + static final AccessSection ALL_VALUES_SET = + AccessSection.builder("refs/test") + .addPermission(PermissionSerializerTest.ALL_VALUES_SET.toBuilder()) + .build(); + @Test public void roundTrip() { - AccessSection autoValue = - AccessSection.builder("refs/test") - .addPermission(PermissionSerializerTest.ALL_VALUES_SET.toBuilder()) - .build(); - assertThat(deserialize(serialize(autoValue))).isEqualTo(autoValue); + assertThat(deserialize(serialize(ALL_VALUES_SET))).isEqualTo(ALL_VALUES_SET); } @Test diff --git a/javatests/com/google/gerrit/server/cache/serialize/entities/BUILD b/javatests/com/google/gerrit/server/cache/serialize/entities/BUILD index 5470553d9e..7fe73d5326 100644 --- a/javatests/com/google/gerrit/server/cache/serialize/entities/BUILD +++ b/javatests/com/google/gerrit/server/cache/serialize/entities/BUILD @@ -12,6 +12,7 @@ junit_tests( "//java/com/google/gerrit/server/cache/testing", "//java/com/google/gerrit/testing:gerrit-test-util", "//lib:guava", + "//lib:jgit", "//lib:protobuf", "//lib/truth", "//lib/truth:truth-proto-extension", diff --git a/javatests/com/google/gerrit/server/cache/serialize/entities/BranchOrderSectionSerializerTest.java b/javatests/com/google/gerrit/server/cache/serialize/entities/BranchOrderSectionSerializerTest.java index f3a0445973..10b905a520 100644 --- a/javatests/com/google/gerrit/server/cache/serialize/entities/BranchOrderSectionSerializerTest.java +++ b/javatests/com/google/gerrit/server/cache/serialize/entities/BranchOrderSectionSerializerTest.java @@ -23,9 +23,11 @@ import com.google.gerrit.entities.BranchOrderSection; import org.junit.Test; public class BranchOrderSectionSerializerTest { + static final BranchOrderSection ALL_VALUES_SET = + BranchOrderSection.create(ImmutableList.of("master", "stable")); + @Test public void roundTrip() { - BranchOrderSection autoValue = BranchOrderSection.create(ImmutableList.of("master", "stable")); - assertThat(deserialize(serialize(autoValue))).isEqualTo(autoValue); + assertThat(deserialize(serialize(ALL_VALUES_SET))).isEqualTo(ALL_VALUES_SET); } } diff --git a/javatests/com/google/gerrit/server/cache/serialize/entities/CachedProjectConfigSerializerTest.java b/javatests/com/google/gerrit/server/cache/serialize/entities/CachedProjectConfigSerializerTest.java new file mode 100644 index 0000000000..2bddf230a4 --- /dev/null +++ b/javatests/com/google/gerrit/server/cache/serialize/entities/CachedProjectConfigSerializerTest.java @@ -0,0 +1,70 @@ +// Copyright (C) 2020 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.server.cache.serialize.entities; + +import static com.google.common.truth.Truth.assertThat; +import static com.google.gerrit.server.cache.serialize.entities.CachedProjectConfigSerializer.deserialize; +import static com.google.gerrit.server.cache.serialize.entities.CachedProjectConfigSerializer.serialize; + +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; +import com.google.gerrit.entities.AccountsSection; +import com.google.gerrit.entities.CachedProjectConfig; +import com.google.gerrit.entities.ConfiguredMimeTypes; +import com.google.gerrit.entities.PermissionRule; +import java.util.Optional; +import org.eclipse.jgit.lib.ObjectId; +import org.junit.Test; + +public class CachedProjectConfigSerializerTest { + static final CachedProjectConfig MINIMAL_VALUES_SET = + CachedProjectConfig.builder() + .setProject(ProjectSerializerTest.ALL_VALUES_SET) + .setMimeTypes( + ConfiguredMimeTypes.create( + ImmutableList.of(new ConfiguredMimeTypes.ReType("type", "pattern")))) + .setAccountsSection( + AccountsSection.create( + ImmutableList.of( + PermissionRule.create(GroupReferenceSerializerTest.ALL_VALUES_SET)))) + .setMaxObjectSizeLimit(123) + .setCheckReceivedObjects(true) + .build(); + + static final CachedProjectConfig ALL_VALUES_SET = + MINIMAL_VALUES_SET + .toBuilder() + .addGroup(GroupReferenceSerializerTest.ALL_VALUES_SET) + .addAccessSection(AccessSectionSerializerTest.ALL_VALUES_SET) + .setBranchOrderSection(Optional.of(BranchOrderSectionSerializerTest.ALL_VALUES_SET)) + .addNotifySection(NotifyConfigSerializerTest.ALL_VALUES_SET) + .addLabelSection(LabelTypeSerializerTest.ALL_VALUES_SET) + .addSubscribeSection(SubscribeSectionSerializerTest.ALL_VALUES_SET) + .addCommentLinkSection(StoredCommentLinkInfoSerializerTest.HTML_ONLY) + .setRevision(Optional.of(ObjectId.fromString("deadbeefdeadbeefdeadbeefdeadbeefdeadbeef"))) + .setRulesId(Optional.of(ObjectId.fromString("deadbeefdeadbeefdeadbeefdeadbeefdeadbeef"))) + .setExtensionPanelSections(ImmutableMap.of("key1", ImmutableList.of("val1", "val2"))) + .build(); + + @Test + public void roundTrip() { + assertThat(deserialize(serialize(ALL_VALUES_SET))).isEqualTo(ALL_VALUES_SET); + } + + @Test + public void roundTripWithMinimalValues() { + assertThat(deserialize(serialize(MINIMAL_VALUES_SET))).isEqualTo(MINIMAL_VALUES_SET); + } +} diff --git a/javatests/com/google/gerrit/server/cache/serialize/entities/ContributorAgreementSerializerTest.java b/javatests/com/google/gerrit/server/cache/serialize/entities/ContributorAgreementSerializerTest.java index 81372d5543..99e3c07e5c 100644 --- a/javatests/com/google/gerrit/server/cache/serialize/entities/ContributorAgreementSerializerTest.java +++ b/javatests/com/google/gerrit/server/cache/serialize/entities/ContributorAgreementSerializerTest.java @@ -19,9 +19,9 @@ import static com.google.gerrit.server.cache.serialize.entities.ContributorAgree import static com.google.gerrit.server.cache.serialize.entities.ContributorAgreementSerializer.serialize; import com.google.common.collect.ImmutableList; -import com.google.gerrit.common.data.ContributorAgreement; -import com.google.gerrit.common.data.PermissionRule; +import com.google.gerrit.entities.ContributorAgreement; import com.google.gerrit.entities.GroupReference; +import com.google.gerrit.entities.PermissionRule; import org.junit.Test; public class ContributorAgreementSerializerTest { diff --git a/javatests/com/google/gerrit/server/cache/serialize/entities/GroupReferenceSerializerTest.java b/javatests/com/google/gerrit/server/cache/serialize/entities/GroupReferenceSerializerTest.java index a5092e0b86..f36633708a 100644 --- a/javatests/com/google/gerrit/server/cache/serialize/entities/GroupReferenceSerializerTest.java +++ b/javatests/com/google/gerrit/server/cache/serialize/entities/GroupReferenceSerializerTest.java @@ -23,11 +23,12 @@ import com.google.gerrit.entities.GroupReference; import org.junit.Test; public class GroupReferenceSerializerTest { + static final GroupReference ALL_VALUES_SET = + GroupReference.create(AccountGroup.uuid("uuid"), "name"); + @Test public void roundTrip() { - GroupReference groupReferenceAutoValue = - GroupReference.create(AccountGroup.uuid("uuid"), "name"); - assertThat(deserialize(serialize(groupReferenceAutoValue))).isEqualTo(groupReferenceAutoValue); + assertThat(deserialize(serialize(ALL_VALUES_SET))).isEqualTo(ALL_VALUES_SET); } @Test diff --git a/javatests/com/google/gerrit/server/cache/serialize/entities/LabelTypeSerializerTest.java b/javatests/com/google/gerrit/server/cache/serialize/entities/LabelTypeSerializerTest.java index fac662d108..64e64a632c 100644 --- a/javatests/com/google/gerrit/server/cache/serialize/entities/LabelTypeSerializerTest.java +++ b/javatests/com/google/gerrit/server/cache/serialize/entities/LabelTypeSerializerTest.java @@ -19,7 +19,7 @@ import static com.google.gerrit.server.cache.serialize.entities.LabelTypeSeriali import static com.google.gerrit.server.cache.serialize.entities.LabelTypeSerializer.serialize; import com.google.common.collect.ImmutableList; -import com.google.gerrit.common.data.LabelType; +import com.google.gerrit.entities.LabelType; import com.google.gerrit.entities.LabelValue; import org.junit.Test; diff --git a/javatests/com/google/gerrit/server/cache/serialize/entities/NotifyConfigSerializerTest.java b/javatests/com/google/gerrit/server/cache/serialize/entities/NotifyConfigSerializerTest.java index 3447ae37ab..5052dfc553 100644 --- a/javatests/com/google/gerrit/server/cache/serialize/entities/NotifyConfigSerializerTest.java +++ b/javatests/com/google/gerrit/server/cache/serialize/entities/NotifyConfigSerializerTest.java @@ -25,18 +25,19 @@ import com.google.gerrit.entities.NotifyConfig; import org.junit.Test; public class NotifyConfigSerializerTest { + static final NotifyConfig ALL_VALUES_SET = + NotifyConfig.builder() + .setName("foo-bar") + .addAddress(Address.create("address@example.com")) + .addGroup(GroupReference.create("group-uuid")) + .setHeader(NotifyConfig.Header.CC) + .setFilter("filter") + .setNotify(ImmutableSet.of(NotifyConfig.NotifyType.ALL_COMMENTS)) + .build(); + @Test public void roundTrip() { - NotifyConfig autoValue = - NotifyConfig.builder() - .setName("foo-bar") - .addAddress(Address.create("address@example.com")) - .addGroup(GroupReference.create("group-uuid")) - .setHeader(NotifyConfig.Header.CC) - .setFilter("filter") - .setNotify(ImmutableSet.of(NotifyConfig.NotifyType.ALL_COMMENTS)) - .build(); - assertThat(deserialize(serialize(autoValue))).isEqualTo(autoValue); + assertThat(deserialize(serialize(ALL_VALUES_SET))).isEqualTo(ALL_VALUES_SET); } @Test diff --git a/javatests/com/google/gerrit/server/cache/serialize/entities/PermissionRuleSerializerTest.java b/javatests/com/google/gerrit/server/cache/serialize/entities/PermissionRuleSerializerTest.java index 3ce3549ccc..05a6121788 100644 --- a/javatests/com/google/gerrit/server/cache/serialize/entities/PermissionRuleSerializerTest.java +++ b/javatests/com/google/gerrit/server/cache/serialize/entities/PermissionRuleSerializerTest.java @@ -18,8 +18,8 @@ import static com.google.common.truth.Truth.assertThat; import static com.google.gerrit.server.cache.serialize.entities.PermissionRuleSerializer.deserialize; import static com.google.gerrit.server.cache.serialize.entities.PermissionRuleSerializer.serialize; -import com.google.gerrit.common.data.PermissionRule; import com.google.gerrit.entities.GroupReference; +import com.google.gerrit.entities.PermissionRule; import org.junit.Test; public class PermissionRuleSerializerTest { diff --git a/javatests/com/google/gerrit/server/cache/serialize/entities/PermissionSerializerTest.java b/javatests/com/google/gerrit/server/cache/serialize/entities/PermissionSerializerTest.java index ae399eb1d1..81ef787239 100644 --- a/javatests/com/google/gerrit/server/cache/serialize/entities/PermissionSerializerTest.java +++ b/javatests/com/google/gerrit/server/cache/serialize/entities/PermissionSerializerTest.java @@ -18,9 +18,9 @@ import static com.google.common.truth.Truth.assertThat; import static com.google.gerrit.server.cache.serialize.entities.PermissionSerializer.deserialize; import static com.google.gerrit.server.cache.serialize.entities.PermissionSerializer.serialize; -import com.google.gerrit.common.data.Permission; -import com.google.gerrit.common.data.PermissionRule; import com.google.gerrit.entities.GroupReference; +import com.google.gerrit.entities.Permission; +import com.google.gerrit.entities.PermissionRule; import org.junit.Test; public class PermissionSerializerTest { diff --git a/javatests/com/google/gerrit/server/cache/serialize/entities/ProjectSerializerTest.java b/javatests/com/google/gerrit/server/cache/serialize/entities/ProjectSerializerTest.java index 8d13247cfe..29fd5edc9e 100644 --- a/javatests/com/google/gerrit/server/cache/serialize/entities/ProjectSerializerTest.java +++ b/javatests/com/google/gerrit/server/cache/serialize/entities/ProjectSerializerTest.java @@ -26,26 +26,25 @@ import com.google.gerrit.extensions.client.SubmitType; import org.junit.Test; public class ProjectSerializerTest { + static final Project ALL_VALUES_SET = + Project.builder(Project.nameKey("test")) + .setDescription("desc") + .setSubmitType(SubmitType.FAST_FORWARD_ONLY) + .setState(ProjectState.HIDDEN) + .setParent(Project.nameKey("parent")) + .setMaxObjectSizeLimit("11K") + .setDefaultDashboard("dashboard1") + .setLocalDefaultDashboard("dashboard2") + .setConfigRefState("1337") + .setBooleanConfig(BooleanProjectConfig.ENABLE_REVIEWER_BY_EMAIL, InheritableBoolean.TRUE) + .setBooleanConfig( + BooleanProjectConfig.CREATE_NEW_CHANGE_FOR_ALL_NOT_IN_TARGET, + InheritableBoolean.INHERIT) + .build(); + @Test public void roundTrip() { - Project projectAutoValue = - Project.builder(Project.nameKey("test")) - .setDescription("desc") - .setSubmitType(SubmitType.FAST_FORWARD_ONLY) - .setState(ProjectState.HIDDEN) - .setParent(Project.nameKey("parent")) - .setMaxObjectSizeLimit("11K") - .setDefaultDashboard("dashboard1") - .setLocalDefaultDashboard("dashboard2") - .setConfigRefState("1337") - .setBooleanConfig( - BooleanProjectConfig.ENABLE_REVIEWER_BY_EMAIL, InheritableBoolean.TRUE) - .setBooleanConfig( - BooleanProjectConfig.CREATE_NEW_CHANGE_FOR_ALL_NOT_IN_TARGET, - InheritableBoolean.INHERIT) - .build(); - - assertThat(deserialize(serialize(projectAutoValue))).isEqualTo(projectAutoValue); + assertThat(deserialize(serialize(ALL_VALUES_SET))).isEqualTo(ALL_VALUES_SET); } @Test diff --git a/javatests/com/google/gerrit/server/cache/serialize/entities/StoredCommentLinkInfoSerializerTest.java b/javatests/com/google/gerrit/server/cache/serialize/entities/StoredCommentLinkInfoSerializerTest.java index ccd2378ab6..3a51b70a01 100644 --- a/javatests/com/google/gerrit/server/cache/serialize/entities/StoredCommentLinkInfoSerializerTest.java +++ b/javatests/com/google/gerrit/server/cache/serialize/entities/StoredCommentLinkInfoSerializerTest.java @@ -22,15 +22,16 @@ import com.google.gerrit.entities.StoredCommentLinkInfo; import org.junit.Test; public class StoredCommentLinkInfoSerializerTest { + static final StoredCommentLinkInfo HTML_ONLY = + StoredCommentLinkInfo.builder("name") + .setEnabled(true) + .setHtml("

html") + .setMatch("*") + .build(); + @Test public void htmlOnly_roundTrip() { - StoredCommentLinkInfo autoValue = - StoredCommentLinkInfo.builder("name") - .setEnabled(true) - .setHtml("

html") - .setMatch("*") - .build(); - assertThat(deserialize(serialize(autoValue))).isEqualTo(autoValue); + assertThat(deserialize(serialize(HTML_ONLY))).isEqualTo(HTML_ONLY); } @Test diff --git a/javatests/com/google/gerrit/server/cache/serialize/entities/SubscribeSectionSerializerTest.java b/javatests/com/google/gerrit/server/cache/serialize/entities/SubscribeSectionSerializerTest.java index fc9693250d..1648eca353 100644 --- a/javatests/com/google/gerrit/server/cache/serialize/entities/SubscribeSectionSerializerTest.java +++ b/javatests/com/google/gerrit/server/cache/serialize/entities/SubscribeSectionSerializerTest.java @@ -18,20 +18,21 @@ import static com.google.common.truth.Truth.assertThat; import static com.google.gerrit.server.cache.serialize.entities.SubscribeSectionSerializer.deserialize; import static com.google.gerrit.server.cache.serialize.entities.SubscribeSectionSerializer.serialize; -import com.google.gerrit.common.data.SubscribeSection; import com.google.gerrit.entities.Project; +import com.google.gerrit.entities.SubscribeSection; import org.junit.Test; public class SubscribeSectionSerializerTest { + static final SubscribeSection ALL_VALUES_SET = + SubscribeSection.builder(Project.nameKey("project")) + .addMultiMatchRefSpec("multi") + .addMultiMatchRefSpec("multi2") + .addMatchingRefSpec("matching1") + .addMatchingRefSpec("matching2") + .build(); + @Test public void roundTrip() { - SubscribeSection autoValue = - SubscribeSection.builder(Project.nameKey("project")) - .addMultiMatchRefSpec("multi") - .addMultiMatchRefSpec("multi2") - .addMatchingRefSpec("matching1") - .addMatchingRefSpec("matching2") - .build(); - assertThat(deserialize(serialize(autoValue))).isEqualTo(autoValue); + assertThat(deserialize(serialize(ALL_VALUES_SET))).isEqualTo(ALL_VALUES_SET); } } diff --git a/javatests/com/google/gerrit/server/change/LabelNormalizerTest.java b/javatests/com/google/gerrit/server/change/LabelNormalizerTest.java index ea210ab618..683f5a624c 100644 --- a/javatests/com/google/gerrit/server/change/LabelNormalizerTest.java +++ b/javatests/com/google/gerrit/server/change/LabelNormalizerTest.java @@ -15,7 +15,7 @@ package com.google.gerrit.server.change; import static com.google.gerrit.acceptance.testsuite.project.TestProjectUpdate.allowLabel; -import static com.google.gerrit.common.data.Permission.forLabel; +import static com.google.gerrit.entities.Permission.forLabel; import static com.google.gerrit.server.group.SystemGroupBackend.REGISTERED_USERS; import static com.google.gerrit.server.project.testing.TestLabels.label; import static com.google.gerrit.server.project.testing.TestLabels.value; @@ -23,11 +23,11 @@ import static org.junit.Assert.assertEquals; import com.google.common.collect.ImmutableList; import com.google.gerrit.acceptance.testsuite.project.ProjectOperations; -import com.google.gerrit.common.data.AccessSection; -import com.google.gerrit.common.data.LabelType; +import com.google.gerrit.entities.AccessSection; import com.google.gerrit.entities.Account; import com.google.gerrit.entities.Change; import com.google.gerrit.entities.LabelId; +import com.google.gerrit.entities.LabelType; import com.google.gerrit.entities.PatchSetApproval; import com.google.gerrit.extensions.api.GerritApi; import com.google.gerrit.extensions.common.ChangeInfo; diff --git a/javatests/com/google/gerrit/server/index/change/ChangeFieldTest.java b/javatests/com/google/gerrit/server/index/change/ChangeFieldTest.java index 47877b6349..40a697880d 100644 --- a/javatests/com/google/gerrit/server/index/change/ChangeFieldTest.java +++ b/javatests/com/google/gerrit/server/index/change/ChangeFieldTest.java @@ -22,10 +22,10 @@ import static java.util.stream.Collectors.toList; import com.google.common.collect.HashBasedTable; import com.google.common.collect.ImmutableList; import com.google.common.collect.Table; -import com.google.gerrit.common.data.SubmitRecord; -import com.google.gerrit.common.data.SubmitRequirement; import com.google.gerrit.entities.Account; import com.google.gerrit.entities.Change; +import com.google.gerrit.entities.SubmitRecord; +import com.google.gerrit.entities.SubmitRequirement; import com.google.gerrit.server.ReviewerSet; import com.google.gerrit.server.notedb.ReviewerStateInternal; import com.google.gerrit.server.util.time.TimeUtil; diff --git a/javatests/com/google/gerrit/server/notedb/AbstractChangeNotesTest.java b/javatests/com/google/gerrit/server/notedb/AbstractChangeNotesTest.java index bf9b1873d9..be4d1412ef 100644 --- a/javatests/com/google/gerrit/server/notedb/AbstractChangeNotesTest.java +++ b/javatests/com/google/gerrit/server/notedb/AbstractChangeNotesTest.java @@ -18,7 +18,6 @@ import static com.google.inject.Scopes.SINGLETON; import static java.util.concurrent.TimeUnit.SECONDS; import com.google.common.collect.ImmutableList; -import com.google.gerrit.common.data.SubmitRecord; import com.google.gerrit.entities.Account; import com.google.gerrit.entities.Change; import com.google.gerrit.entities.Comment; @@ -26,6 +25,7 @@ import com.google.gerrit.entities.CommentRange; import com.google.gerrit.entities.HumanComment; import com.google.gerrit.entities.PatchSet; import com.google.gerrit.entities.Project; +import com.google.gerrit.entities.SubmitRecord; import com.google.gerrit.extensions.config.FactoryModule; import com.google.gerrit.metrics.DisabledMetricMaker; import com.google.gerrit.metrics.MetricMaker; diff --git a/javatests/com/google/gerrit/server/notedb/ChangeNotesStateTest.java b/javatests/com/google/gerrit/server/notedb/ChangeNotesStateTest.java index f1b7198cf8..dd3238fae4 100644 --- a/javatests/com/google/gerrit/server/notedb/ChangeNotesStateTest.java +++ b/javatests/com/google/gerrit/server/notedb/ChangeNotesStateTest.java @@ -25,8 +25,6 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableTable; import com.google.common.collect.Iterables; -import com.google.gerrit.common.data.SubmitRecord; -import com.google.gerrit.common.data.SubmitRequirement; import com.google.gerrit.entities.Account; import com.google.gerrit.entities.Address; import com.google.gerrit.entities.AttentionSetUpdate; @@ -37,6 +35,8 @@ import com.google.gerrit.entities.HumanComment; import com.google.gerrit.entities.LabelId; import com.google.gerrit.entities.PatchSet; import com.google.gerrit.entities.PatchSetApproval; +import com.google.gerrit.entities.SubmitRecord; +import com.google.gerrit.entities.SubmitRequirement; import com.google.gerrit.entities.converter.ChangeMessageProtoConverter; import com.google.gerrit.entities.converter.PatchSetApprovalProtoConverter; import com.google.gerrit.entities.converter.PatchSetProtoConverter; diff --git a/javatests/com/google/gerrit/server/notedb/ChangeNotesTest.java b/javatests/com/google/gerrit/server/notedb/ChangeNotesTest.java index b0b1c1e2d1..938fffc443 100644 --- a/javatests/com/google/gerrit/server/notedb/ChangeNotesTest.java +++ b/javatests/com/google/gerrit/server/notedb/ChangeNotesTest.java @@ -36,7 +36,6 @@ import com.google.common.collect.ImmutableTable; import com.google.common.collect.Iterables; import com.google.common.collect.ListMultimap; import com.google.common.collect.Lists; -import com.google.gerrit.common.data.SubmitRecord; import com.google.gerrit.entities.Account; import com.google.gerrit.entities.Address; import com.google.gerrit.entities.AttentionSetUpdate; @@ -49,6 +48,7 @@ import com.google.gerrit.entities.HumanComment; import com.google.gerrit.entities.PatchSet; import com.google.gerrit.entities.PatchSetApproval; import com.google.gerrit.entities.SubmissionId; +import com.google.gerrit.entities.SubmitRecord; import com.google.gerrit.exceptions.StorageException; import com.google.gerrit.server.AssigneeStatusUpdate; import com.google.gerrit.server.CurrentUser; diff --git a/javatests/com/google/gerrit/server/permissions/DefaultPermissionsMappingTest.java b/javatests/com/google/gerrit/server/permissions/DefaultPermissionsMappingTest.java index 305e81bf1c..6c5eb7a746 100644 --- a/javatests/com/google/gerrit/server/permissions/DefaultPermissionsMappingTest.java +++ b/javatests/com/google/gerrit/server/permissions/DefaultPermissionsMappingTest.java @@ -17,7 +17,7 @@ package com.google.gerrit.server.permissions; import static com.google.common.truth.Truth8.assertThat; import static com.google.gerrit.server.permissions.DefaultPermissionMappings.refPermission; -import com.google.gerrit.common.data.Permission; +import com.google.gerrit.entities.Permission; import org.junit.Test; public class DefaultPermissionsMappingTest { diff --git a/javatests/com/google/gerrit/server/permissions/RefControlTest.java b/javatests/com/google/gerrit/server/permissions/RefControlTest.java index 902930108b..81cb732b82 100644 --- a/javatests/com/google/gerrit/server/permissions/RefControlTest.java +++ b/javatests/com/google/gerrit/server/permissions/RefControlTest.java @@ -23,12 +23,12 @@ import static com.google.gerrit.acceptance.testsuite.project.TestProjectUpdate.b import static com.google.gerrit.acceptance.testsuite.project.TestProjectUpdate.deny; import static com.google.gerrit.acceptance.testsuite.project.TestProjectUpdate.labelPermissionKey; import static com.google.gerrit.acceptance.testsuite.project.TestProjectUpdate.permissionKey; -import static com.google.gerrit.common.data.Permission.EDIT_TOPIC_NAME; -import static com.google.gerrit.common.data.Permission.LABEL; -import static com.google.gerrit.common.data.Permission.OWNER; -import static com.google.gerrit.common.data.Permission.PUSH; -import static com.google.gerrit.common.data.Permission.READ; -import static com.google.gerrit.common.data.Permission.SUBMIT; +import static com.google.gerrit.entities.Permission.EDIT_TOPIC_NAME; +import static com.google.gerrit.entities.Permission.LABEL; +import static com.google.gerrit.entities.Permission.OWNER; +import static com.google.gerrit.entities.Permission.PUSH; +import static com.google.gerrit.entities.Permission.READ; +import static com.google.gerrit.entities.Permission.SUBMIT; import static com.google.gerrit.entities.RefNames.REFS_CONFIG; import static com.google.gerrit.server.group.SystemGroupBackend.ANONYMOUS_USERS; import static com.google.gerrit.server.group.SystemGroupBackend.CHANGE_OWNER; @@ -39,9 +39,9 @@ import static com.google.gerrit.testing.GerritJUnit.assertThrows; import com.google.common.collect.Lists; import com.google.gerrit.acceptance.testsuite.project.ProjectOperations; import com.google.gerrit.common.Nullable; -import com.google.gerrit.common.data.LabelType; -import com.google.gerrit.common.data.PermissionRange; import com.google.gerrit.entities.AccountGroup; +import com.google.gerrit.entities.LabelType; +import com.google.gerrit.entities.PermissionRange; import com.google.gerrit.entities.Project; import com.google.gerrit.exceptions.InvalidNameException; import com.google.gerrit.server.CurrentUser; diff --git a/javatests/com/google/gerrit/server/project/CommitsCollectionTest.java b/javatests/com/google/gerrit/server/project/CommitsCollectionTest.java index 5af8a1eb63..1035fe780f 100644 --- a/javatests/com/google/gerrit/server/project/CommitsCollectionTest.java +++ b/javatests/com/google/gerrit/server/project/CommitsCollectionTest.java @@ -17,7 +17,7 @@ package com.google.gerrit.server.project; import static com.google.gerrit.acceptance.testsuite.project.TestProjectUpdate.allow; import static com.google.gerrit.acceptance.testsuite.project.TestProjectUpdate.deny; import static com.google.gerrit.acceptance.testsuite.project.TestProjectUpdate.permissionKey; -import static com.google.gerrit.common.data.Permission.READ; +import static com.google.gerrit.entities.Permission.READ; import static com.google.gerrit.server.group.SystemGroupBackend.REGISTERED_USERS; import static org.eclipse.jgit.lib.Constants.R_REFS; import static org.junit.Assert.assertFalse; @@ -26,13 +26,13 @@ import static org.junit.Assert.assertTrue; import com.google.common.collect.ImmutableList; import com.google.gerrit.acceptance.testsuite.project.ProjectOperations; import com.google.gerrit.acceptance.testsuite.project.TestProjectUpdate; -import com.google.gerrit.common.data.AccessSection; import com.google.gerrit.common.data.GlobalCapability; -import com.google.gerrit.common.data.Permission; -import com.google.gerrit.common.data.PermissionRule; +import com.google.gerrit.entities.AccessSection; import com.google.gerrit.entities.Account; import com.google.gerrit.entities.AccountGroup; import com.google.gerrit.entities.GroupReference; +import com.google.gerrit.entities.Permission; +import com.google.gerrit.entities.PermissionRule; import com.google.gerrit.entities.Project; import com.google.gerrit.server.account.AccountManager; import com.google.gerrit.server.account.AuthRequest; diff --git a/javatests/com/google/gerrit/server/project/ProjectConfigTest.java b/javatests/com/google/gerrit/server/project/ProjectConfigTest.java index 6ea6a33e43..d6f89d0d67 100644 --- a/javatests/com/google/gerrit/server/project/ProjectConfigTest.java +++ b/javatests/com/google/gerrit/server/project/ProjectConfigTest.java @@ -20,14 +20,15 @@ import static com.google.gerrit.entities.BooleanProjectConfig.REQUIRE_CHANGE_ID; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; -import com.google.gerrit.common.data.AccessSection; -import com.google.gerrit.common.data.ContributorAgreement; -import com.google.gerrit.common.data.LabelType; -import com.google.gerrit.common.data.Permission; -import com.google.gerrit.common.data.PermissionRule; +import com.google.gerrit.entities.AccessSection; import com.google.gerrit.entities.AccountGroup; +import com.google.gerrit.entities.AccountsSection; import com.google.gerrit.entities.BranchOrderSection; +import com.google.gerrit.entities.ContributorAgreement; import com.google.gerrit.entities.GroupReference; +import com.google.gerrit.entities.LabelType; +import com.google.gerrit.entities.Permission; +import com.google.gerrit.entities.PermissionRule; import com.google.gerrit.entities.Project; import com.google.gerrit.entities.RefNames; import com.google.gerrit.entities.StoredCommentLinkInfo; diff --git a/javatests/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java b/javatests/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java index a013145118..36f31c75c4 100644 --- a/javatests/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java +++ b/javatests/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java @@ -44,16 +44,16 @@ import com.google.common.truth.ThrowableSubject; import com.google.gerrit.acceptance.config.GerritConfig; import com.google.gerrit.acceptance.testsuite.project.ProjectOperations; import com.google.gerrit.common.Nullable; -import com.google.gerrit.common.data.LabelType; -import com.google.gerrit.common.data.Permission; -import com.google.gerrit.common.data.PermissionRule; import com.google.gerrit.entities.Account; import com.google.gerrit.entities.AccountGroup; import com.google.gerrit.entities.BranchNameKey; import com.google.gerrit.entities.Change; import com.google.gerrit.entities.GroupReference; +import com.google.gerrit.entities.LabelType; import com.google.gerrit.entities.Patch; import com.google.gerrit.entities.PatchSet; +import com.google.gerrit.entities.Permission; +import com.google.gerrit.entities.PermissionRule; import com.google.gerrit.entities.Project; import com.google.gerrit.entities.RefNames; import com.google.gerrit.extensions.api.GerritApi; diff --git a/javatests/com/google/gerrit/server/rules/GerritCommonTest.java b/javatests/com/google/gerrit/server/rules/GerritCommonTest.java index 9d7afbc8cb..871c871045 100644 --- a/javatests/com/google/gerrit/server/rules/GerritCommonTest.java +++ b/javatests/com/google/gerrit/server/rules/GerritCommonTest.java @@ -19,7 +19,7 @@ import static com.google.gerrit.testing.GerritJUnit.assertThrows; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import com.google.gerrit.common.data.LabelTypes; +import com.google.gerrit.entities.LabelTypes; import com.google.gerrit.server.project.testing.TestLabels; import com.google.gerrit.server.query.change.ChangeData; import com.google.inject.AbstractModule; diff --git a/javatests/com/google/gerrit/server/rules/IgnoreSelfApprovalRuleTest.java b/javatests/com/google/gerrit/server/rules/IgnoreSelfApprovalRuleTest.java index 858f6a2c5e..cf5e8febd7 100644 --- a/javatests/com/google/gerrit/server/rules/IgnoreSelfApprovalRuleTest.java +++ b/javatests/com/google/gerrit/server/rules/IgnoreSelfApprovalRuleTest.java @@ -17,10 +17,10 @@ package com.google.gerrit.server.rules; import static com.google.common.truth.Truth.assertThat; import com.google.common.collect.ImmutableList; -import com.google.gerrit.common.data.LabelType; import com.google.gerrit.entities.Account; import com.google.gerrit.entities.Change; import com.google.gerrit.entities.LabelId; +import com.google.gerrit.entities.LabelType; import com.google.gerrit.entities.LabelValue; import com.google.gerrit.entities.PatchSet; import com.google.gerrit.entities.PatchSetApproval; diff --git a/javatests/com/google/gerrit/server/schema/AllProjectsCreatorTest.java b/javatests/com/google/gerrit/server/schema/AllProjectsCreatorTest.java index 18d279f66a..7603631929 100644 --- a/javatests/com/google/gerrit/server/schema/AllProjectsCreatorTest.java +++ b/javatests/com/google/gerrit/server/schema/AllProjectsCreatorTest.java @@ -23,10 +23,10 @@ import static com.google.gerrit.server.schema.testing.AllProjectsCreatorTestUtil import static com.google.gerrit.truth.ConfigSubject.assertThat; import com.google.common.collect.ImmutableList; -import com.google.gerrit.common.data.LabelType; import com.google.gerrit.entities.AccountGroup; import com.google.gerrit.entities.BooleanProjectConfig; import com.google.gerrit.entities.GroupReference; +import com.google.gerrit.entities.LabelType; import com.google.gerrit.entities.LabelValue; import com.google.gerrit.extensions.client.InheritableBoolean; import com.google.gerrit.server.GerritPersonIdent; diff --git a/javatests/com/google/gerrit/server/schema/SchemaCreatorImplTest.java b/javatests/com/google/gerrit/server/schema/SchemaCreatorImplTest.java index d58713a020..bd673b5e45 100644 --- a/javatests/com/google/gerrit/server/schema/SchemaCreatorImplTest.java +++ b/javatests/com/google/gerrit/server/schema/SchemaCreatorImplTest.java @@ -18,9 +18,9 @@ import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth8.assertThat; import com.google.common.collect.ImmutableList; -import com.google.gerrit.common.data.LabelFunction; -import com.google.gerrit.common.data.LabelType; -import com.google.gerrit.common.data.LabelTypes; +import com.google.gerrit.entities.LabelFunction; +import com.google.gerrit.entities.LabelType; +import com.google.gerrit.entities.LabelTypes; import com.google.gerrit.entities.LabelValue; import com.google.gerrit.server.config.AllProjectsName; import com.google.gerrit.server.git.GitRepositoryManager; diff --git a/javatests/com/google/gerrit/server/submit/SubscriptionGraphTest.java b/javatests/com/google/gerrit/server/submit/SubscriptionGraphTest.java index 5f7154420e..fb995fdbf4 100644 --- a/javatests/com/google/gerrit/server/submit/SubscriptionGraphTest.java +++ b/javatests/com/google/gerrit/server/submit/SubscriptionGraphTest.java @@ -22,10 +22,10 @@ import static org.mockito.Mockito.when; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; -import com.google.gerrit.common.data.SubscribeSection; import com.google.gerrit.entities.BranchNameKey; import com.google.gerrit.entities.Project; import com.google.gerrit.entities.SubmoduleSubscription; +import com.google.gerrit.entities.SubscribeSection; import com.google.gerrit.server.project.ProjectCache; import com.google.gerrit.server.project.ProjectState; import com.google.gerrit.server.submit.SubscriptionGraph.DefaultFactory; diff --git a/javatests/com/google/gerrit/server/update/BatchUpdateTest.java b/javatests/com/google/gerrit/server/update/BatchUpdateTest.java index 083493de43..287a7fe99c 100644 --- a/javatests/com/google/gerrit/server/update/BatchUpdateTest.java +++ b/javatests/com/google/gerrit/server/update/BatchUpdateTest.java @@ -22,12 +22,12 @@ import static com.google.gerrit.testing.GerritJUnit.assertThrows; import com.google.common.cache.Cache; import com.google.common.collect.ImmutableList; import com.google.gerrit.common.Nullable; -import com.google.gerrit.common.data.SubmitRecord; import com.google.gerrit.entities.Change; import com.google.gerrit.entities.PatchSet; import com.google.gerrit.entities.Project; import com.google.gerrit.entities.RefNames; import com.google.gerrit.entities.SubmissionId; +import com.google.gerrit.entities.SubmitRecord; import com.google.gerrit.extensions.restapi.ResourceConflictException; import com.google.gerrit.server.CurrentUser; import com.google.gerrit.server.change.ChangeInserter; diff --git a/plugins/delete-project b/plugins/delete-project index 64db8df08e..a9976d071d 160000 --- a/plugins/delete-project +++ b/plugins/delete-project @@ -1 +1 @@ -Subproject commit 64db8df08e855d8367c146bc5071f68f70df5171 +Subproject commit a9976d071ddae916865d5bad1d66507caffe3057 diff --git a/plugins/replication b/plugins/replication index 9d4d19a579..9a07d19326 160000 --- a/plugins/replication +++ b/plugins/replication @@ -1 +1 @@ -Subproject commit 9d4d19a579fc4962ab7f85f6b5cb12501ed048ad +Subproject commit 9a07d19326cab1dccbab5696c31f89dc8cb2e8a6 diff --git a/plugins/reviewnotes b/plugins/reviewnotes index 05f0ddd309..fb0390a8b4 160000 --- a/plugins/reviewnotes +++ b/plugins/reviewnotes @@ -1 +1 @@ -Subproject commit 05f0ddd30928d0d050696f3d269dea0899334513 +Subproject commit fb0390a8b49f0d601e11f8a1ac0658c429727f21 diff --git a/proto/cache.proto b/proto/cache.proto index 29b5870316..573bdf4a72 100644 --- a/proto/cache.proto +++ b/proto/cache.proto @@ -463,3 +463,29 @@ message StoredCommentLinkInfoProto { bool enabled = 5; bool override_only = 6; } + +// Serialized form of com.google.gerrit.entities.CachedProjectConfigProto. +// Next ID: 17 +message CachedProjectConfigProto { + ProjectProto project = 1; + repeated GroupReferenceProto group_list = 2; + repeated PermissionRuleProto accounts_section = 3; + repeated AccessSectionProto access_sections = 4; + BranchOrderSectionProto branch_order_section = 5; + repeated ContributorAgreementProto contributor_agreements = 6; + repeated NotifyConfigProto notify_configs = 7; + repeated LabelTypeProto label_sections = 8; + repeated ConfiguredMimeTypeProto mime_types = 9; + repeated SubscribeSectionProto subscribe_sections = 10; + repeated StoredCommentLinkInfoProto comment_links = 11; + bytes rules_id = 12; + bytes revision = 13; + int64 max_object_size_limit = 14; + bool check_received_objects = 15; + map extension_panels = 16; + + // Next ID: 2 + message ExtensionPanelSectionProto { + repeated string section = 1; + } +}