diff --git a/java/com/google/gerrit/acceptance/AbstractDaemonTest.java b/java/com/google/gerrit/acceptance/AbstractDaemonTest.java index bef7804985..b633c97cc3 100644 --- a/java/com/google/gerrit/acceptance/AbstractDaemonTest.java +++ b/java/com/google/gerrit/acceptance/AbstractDaemonTest.java @@ -50,8 +50,6 @@ 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.GroupDescription; -import com.google.gerrit.common.data.GroupReference; import com.google.gerrit.common.data.LabelFunction; import com.google.gerrit.common.data.LabelType; import com.google.gerrit.common.data.LabelValue; @@ -65,6 +63,8 @@ import com.google.gerrit.entities.BooleanProjectConfig; import com.google.gerrit.entities.BranchNameKey; 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.PatchSet; import com.google.gerrit.entities.Project; import com.google.gerrit.entities.RefNames; diff --git a/java/com/google/gerrit/acceptance/AbstractNotificationTest.java b/java/com/google/gerrit/acceptance/AbstractNotificationTest.java index 6732b07974..452df676ad 100644 --- a/java/com/google/gerrit/acceptance/AbstractNotificationTest.java +++ b/java/com/google/gerrit/acceptance/AbstractNotificationTest.java @@ -31,6 +31,7 @@ import com.google.gerrit.common.Nullable; import com.google.gerrit.entities.Address; import com.google.gerrit.entities.EmailHeader; import com.google.gerrit.entities.EmailHeader.AddressList; +import com.google.gerrit.entities.NotifyConfig.NotifyType; import com.google.gerrit.extensions.api.changes.RecipientType; import com.google.gerrit.extensions.api.changes.ReviewInput; import com.google.gerrit.extensions.api.changes.ReviewResult; @@ -39,7 +40,6 @@ import com.google.gerrit.extensions.client.GeneralPreferencesInfo; import com.google.gerrit.extensions.client.GeneralPreferencesInfo.EmailStrategy; import com.google.gerrit.extensions.client.InheritableBoolean; import com.google.gerrit.extensions.client.ReviewerState; -import com.google.gerrit.server.account.ProjectWatches.NotifyType; import com.google.gerrit.testing.FakeEmailSender; import com.google.gerrit.testing.FakeEmailSender.Message; import com.google.inject.Inject; diff --git a/java/com/google/gerrit/acceptance/ReindexGroupsAtStartup.java b/java/com/google/gerrit/acceptance/ReindexGroupsAtStartup.java index b985e409f0..0b2282ecbf 100644 --- a/java/com/google/gerrit/acceptance/ReindexGroupsAtStartup.java +++ b/java/com/google/gerrit/acceptance/ReindexGroupsAtStartup.java @@ -14,7 +14,7 @@ package com.google.gerrit.acceptance; -import com.google.gerrit.common.data.GroupReference; +import com.google.gerrit.entities.GroupReference; import com.google.gerrit.extensions.events.LifecycleListener; import com.google.gerrit.lifecycle.LifecycleModule; import com.google.gerrit.server.config.GerritServerConfig; diff --git a/java/com/google/gerrit/acceptance/testsuite/project/ProjectOperationsImpl.java b/java/com/google/gerrit/acceptance/testsuite/project/ProjectOperationsImpl.java index a3ddd98e68..60b37206f1 100644 --- a/java/com/google/gerrit/acceptance/testsuite/project/ProjectOperationsImpl.java +++ b/java/com/google/gerrit/acceptance/testsuite/project/ProjectOperationsImpl.java @@ -27,10 +27,10 @@ import com.google.gerrit.acceptance.testsuite.project.TestProjectUpdate.TestCapa 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.GroupReference; import com.google.gerrit.common.data.Permission; import com.google.gerrit.common.data.PermissionRule; import com.google.gerrit.entities.AccountGroup; +import com.google.gerrit.entities.GroupReference; 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/common/data/ContributorAgreement.java b/java/com/google/gerrit/common/data/ContributorAgreement.java index 1b8d99a121..0f103678fa 100644 --- a/java/com/google/gerrit/common/data/ContributorAgreement.java +++ b/java/com/google/gerrit/common/data/ContributorAgreement.java @@ -17,6 +17,7 @@ package com.google.gerrit.common.data; 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; diff --git a/java/com/google/gerrit/common/data/Permission.java b/java/com/google/gerrit/common/data/Permission.java index 93155d5780..6190957244 100644 --- a/java/com/google/gerrit/common/data/Permission.java +++ b/java/com/google/gerrit/common/data/Permission.java @@ -19,6 +19,7 @@ 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/PermissionRule.java b/java/com/google/gerrit/common/data/PermissionRule.java index c4116526d4..1d2230c618 100644 --- a/java/com/google/gerrit/common/data/PermissionRule.java +++ b/java/com/google/gerrit/common/data/PermissionRule.java @@ -15,6 +15,7 @@ package com.google.gerrit.common.data; 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/testing/GroupReferenceSubject.java b/java/com/google/gerrit/common/data/testing/GroupReferenceSubject.java index d841aa6389..beb62b4870 100644 --- a/java/com/google/gerrit/common/data/testing/GroupReferenceSubject.java +++ b/java/com/google/gerrit/common/data/testing/GroupReferenceSubject.java @@ -20,8 +20,8 @@ import com.google.common.truth.ComparableSubject; import com.google.common.truth.FailureMetadata; import com.google.common.truth.StringSubject; import com.google.common.truth.Subject; -import com.google.gerrit.common.data.GroupReference; import com.google.gerrit.entities.AccountGroup; +import com.google.gerrit.entities.GroupReference; public class GroupReferenceSubject extends Subject { diff --git a/java/com/google/gerrit/common/data/GroupDescription.java b/java/com/google/gerrit/entities/GroupDescription.java similarity index 93% rename from java/com/google/gerrit/common/data/GroupDescription.java rename to java/com/google/gerrit/entities/GroupDescription.java index ed8b39d0a2..e9502576af 100644 --- a/java/com/google/gerrit/common/data/GroupDescription.java +++ b/java/com/google/gerrit/entities/GroupDescription.java @@ -12,11 +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.gerrit.common.Nullable; -import com.google.gerrit.entities.Account; -import com.google.gerrit.entities.AccountGroup; import java.sql.Timestamp; import java.util.Set; diff --git a/java/com/google/gerrit/common/data/GroupReference.java b/java/com/google/gerrit/entities/GroupReference.java similarity index 94% rename from java/com/google/gerrit/common/data/GroupReference.java rename to java/com/google/gerrit/entities/GroupReference.java index 2620138f61..9185d5341b 100644 --- a/java/com/google/gerrit/common/data/GroupReference.java +++ b/java/com/google/gerrit/entities/GroupReference.java @@ -12,15 +12,14 @@ // 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.Objects.requireNonNull; import com.google.auto.value.AutoValue; import com.google.gerrit.common.Nullable; -import com.google.gerrit.entities.AccountGroup; -/** Describes a group within a projects {@link AccessSection}s. */ +/** Describes a group within a projects {@link com.google.gerrit.common.data.AccessSection}s. */ @AutoValue public abstract class GroupReference implements Comparable { diff --git a/java/com/google/gerrit/server/git/NotifyConfig.java b/java/com/google/gerrit/entities/NotifyConfig.java similarity index 91% rename from java/com/google/gerrit/server/git/NotifyConfig.java rename to java/com/google/gerrit/entities/NotifyConfig.java index f07b2d8bfe..17da81fb1f 100644 --- a/java/com/google/gerrit/server/git/NotifyConfig.java +++ b/java/com/google/gerrit/entities/NotifyConfig.java @@ -12,17 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.git; +package com.google.gerrit.entities; import com.google.auto.value.AutoValue; import com.google.common.base.Strings; import com.google.common.collect.ImmutableSet; -import com.google.gerrit.common.data.GroupReference; -import com.google.gerrit.entities.Address; -import com.google.gerrit.server.account.ProjectWatches.NotifyType; +import com.google.gerrit.common.Nullable; import java.util.EnumSet; import java.util.Set; -import org.eclipse.jgit.annotations.Nullable; @AutoValue public abstract class NotifyConfig implements Comparable { @@ -32,7 +29,17 @@ public abstract class NotifyConfig implements Comparable { BCC } - @Nullable + public enum NotifyType { + // sort by name, except 'ALL' which should stay last + ABANDONED_CHANGES, + ALL_COMMENTS, + NEW_CHANGES, + NEW_PATCHSETS, + SUBMITTED_CHANGES, + + ALL + } + public abstract String getName(); public abstract ImmutableSet getNotify(); diff --git a/java/com/google/gerrit/pgm/init/GroupsOnInit.java b/java/com/google/gerrit/pgm/init/GroupsOnInit.java index 0333942e7f..ca28255233 100644 --- a/java/com/google/gerrit/pgm/init/GroupsOnInit.java +++ b/java/com/google/gerrit/pgm/init/GroupsOnInit.java @@ -19,9 +19,9 @@ import static com.google.common.base.Preconditions.checkArgument; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; import com.google.gerrit.common.Nullable; -import com.google.gerrit.common.data.GroupReference; import com.google.gerrit.entities.Account; import com.google.gerrit.entities.AccountGroup; +import com.google.gerrit.entities.GroupReference; import com.google.gerrit.exceptions.NoSuchGroupException; import com.google.gerrit.pgm.init.api.AllUsersNameOnInitProvider; import com.google.gerrit.pgm.init.api.InitFlags; diff --git a/java/com/google/gerrit/pgm/init/InitAdminUser.java b/java/com/google/gerrit/pgm/init/InitAdminUser.java index cf208ae91c..effb4c61c7 100644 --- a/java/com/google/gerrit/pgm/init/InitAdminUser.java +++ b/java/com/google/gerrit/pgm/init/InitAdminUser.java @@ -17,8 +17,8 @@ package com.google.gerrit.pgm.init; import static java.nio.charset.StandardCharsets.UTF_8; import com.google.common.base.Strings; -import com.google.gerrit.common.data.GroupReference; import com.google.gerrit.entities.Account; +import com.google.gerrit.entities.GroupReference; import com.google.gerrit.exceptions.NoSuchGroupException; import com.google.gerrit.extensions.client.AuthType; import com.google.gerrit.pgm.init.api.ConsoleUI; diff --git a/java/com/google/gerrit/pgm/util/BatchProgramModule.java b/java/com/google/gerrit/pgm/util/BatchProgramModule.java index a831b8e1aa..21ce2d1902 100644 --- a/java/com/google/gerrit/pgm/util/BatchProgramModule.java +++ b/java/com/google/gerrit/pgm/util/BatchProgramModule.java @@ -18,8 +18,8 @@ import static com.google.inject.Scopes.SINGLETON; import com.google.common.cache.Cache; import com.google.common.collect.ImmutableSet; -import com.google.gerrit.common.data.GroupReference; import com.google.gerrit.entities.AccountGroup; +import com.google.gerrit.entities.GroupReference; import com.google.gerrit.extensions.api.projects.CommentLinkInfo; import com.google.gerrit.extensions.common.AccountVisibility; import com.google.gerrit.extensions.config.FactoryModule; diff --git a/java/com/google/gerrit/server/account/AccountConfig.java b/java/com/google/gerrit/server/account/AccountConfig.java index 76d94715cc..e95bc1c0ec 100644 --- a/java/com/google/gerrit/server/account/AccountConfig.java +++ b/java/com/google/gerrit/server/account/AccountConfig.java @@ -22,9 +22,9 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.gerrit.entities.Account; +import com.google.gerrit.entities.NotifyConfig.NotifyType; import com.google.gerrit.entities.RefNames; import com.google.gerrit.exceptions.DuplicateKeyException; -import com.google.gerrit.server.account.ProjectWatches.NotifyType; import com.google.gerrit.server.account.ProjectWatches.ProjectWatchKey; import com.google.gerrit.server.account.externalids.ExternalIds; import com.google.gerrit.server.config.AllUsersName; diff --git a/java/com/google/gerrit/server/account/AccountState.java b/java/com/google/gerrit/server/account/AccountState.java index 1e9914dc64..b7a54f4413 100644 --- a/java/com/google/gerrit/server/account/AccountState.java +++ b/java/com/google/gerrit/server/account/AccountState.java @@ -20,10 +20,10 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.gerrit.common.Nullable; import com.google.gerrit.entities.Account; +import com.google.gerrit.entities.NotifyConfig.NotifyType; import com.google.gerrit.extensions.client.DiffPreferencesInfo; import com.google.gerrit.extensions.client.EditPreferencesInfo; import com.google.gerrit.extensions.client.GeneralPreferencesInfo; -import com.google.gerrit.server.account.ProjectWatches.NotifyType; import com.google.gerrit.server.account.ProjectWatches.ProjectWatchKey; import com.google.gerrit.server.account.externalids.ExternalId; import com.google.gerrit.server.account.externalids.ExternalIdNotes; diff --git a/java/com/google/gerrit/server/account/CachedAccountDetails.java b/java/com/google/gerrit/server/account/CachedAccountDetails.java index 2eb57702c0..f23a766035 100644 --- a/java/com/google/gerrit/server/account/CachedAccountDetails.java +++ b/java/com/google/gerrit/server/account/CachedAccountDetails.java @@ -23,6 +23,7 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.gerrit.common.UsedAt; import com.google.gerrit.entities.Account; +import com.google.gerrit.entities.NotifyConfig; import com.google.gerrit.entities.Project; import com.google.gerrit.proto.Protos; import com.google.gerrit.server.cache.proto.Cache; @@ -80,7 +81,7 @@ public abstract class CachedAccountDetails { abstract Account account(); /** Projects that the user has configured to watch. */ - abstract ImmutableMap> + abstract ImmutableMap> projectWatches(); /** Preferences that this user has. Serialized as Git-config style string. */ @@ -88,7 +89,7 @@ public abstract class CachedAccountDetails { static CachedAccountDetails create( Account account, - ImmutableMap> + ImmutableMap> projectWatches, CachedPreferences preferences) { return new AutoValue_CachedAccountDetails(account, projectWatches, preferences); @@ -115,8 +116,8 @@ public abstract class CachedAccountDetails { .setMetaId(Strings.nullToEmpty(account.metaId())); serialized.setAccount(accountProto); - for (Map.Entry> - watch : cachedAccountDetails.projectWatches().entrySet()) { + for (Map.Entry> watch : + cachedAccountDetails.projectWatches().entrySet()) { Cache.ProjectWatchProto.Builder proto = Cache.ProjectWatchProto.newBuilder().setProject(watch.getKey().project().get()); if (watch.getKey().filter() != null) { @@ -127,9 +128,7 @@ public abstract class CachedAccountDetails { .forEach( n -> proto.addNotifyType( - Enums.stringConverter(ProjectWatches.NotifyType.class) - .reverse() - .convert(n))); + Enums.stringConverter(NotifyConfig.NotifyType.class).reverse().convert(n))); serialized.addProjectWatchProto(proto); } @@ -153,7 +152,7 @@ public abstract class CachedAccountDetails { .setMetaId(Strings.emptyToNull(proto.getAccount().getMetaId())) .build(); - ImmutableMap.Builder> + ImmutableMap.Builder> projectWatches = ImmutableMap.builder(); proto.getProjectWatchProtoList().stream() .forEach( @@ -162,9 +161,7 @@ public abstract class CachedAccountDetails { ProjectWatches.ProjectWatchKey.create( Project.nameKey(p.getProject()), p.getFilter()), p.getNotifyTypeList().stream() - .map( - e -> - Enums.stringConverter(ProjectWatches.NotifyType.class).convert(e)) + .map(e -> Enums.stringConverter(NotifyConfig.NotifyType.class).convert(e)) .collect(toImmutableSet()))); return CachedAccountDetails.create( diff --git a/java/com/google/gerrit/server/account/CapabilityCollection.java b/java/com/google/gerrit/server/account/CapabilityCollection.java index de522aeb8c..c1a8f734b2 100644 --- a/java/com/google/gerrit/server/account/CapabilityCollection.java +++ b/java/com/google/gerrit/server/account/CapabilityCollection.java @@ -20,10 +20,10 @@ 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.GroupReference; 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.GroupReference; 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/account/GroupBackend.java b/java/com/google/gerrit/server/account/GroupBackend.java index 3a874bb1fa..545da6ee3f 100644 --- a/java/com/google/gerrit/server/account/GroupBackend.java +++ b/java/com/google/gerrit/server/account/GroupBackend.java @@ -15,9 +15,9 @@ package com.google.gerrit.server.account; import com.google.gerrit.common.Nullable; -import com.google.gerrit.common.data.GroupDescription; -import com.google.gerrit.common.data.GroupReference; import com.google.gerrit.entities.AccountGroup; +import com.google.gerrit.entities.GroupDescription; +import com.google.gerrit.entities.GroupReference; import com.google.gerrit.extensions.annotations.ExtensionPoint; import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.server.project.ProjectState; diff --git a/java/com/google/gerrit/server/account/GroupBackends.java b/java/com/google/gerrit/server/account/GroupBackends.java index 1b1551269f..26b3a82e42 100644 --- a/java/com/google/gerrit/server/account/GroupBackends.java +++ b/java/com/google/gerrit/server/account/GroupBackends.java @@ -18,7 +18,7 @@ import static java.util.Comparator.comparing; import com.google.common.collect.Iterables; import com.google.gerrit.common.Nullable; -import com.google.gerrit.common.data.GroupReference; +import com.google.gerrit.entities.GroupReference; import com.google.gerrit.server.project.ProjectState; import java.util.Collection; import java.util.Comparator; diff --git a/java/com/google/gerrit/server/account/GroupControl.java b/java/com/google/gerrit/server/account/GroupControl.java index 64fd7c68fe..d42db60985 100644 --- a/java/com/google/gerrit/server/account/GroupControl.java +++ b/java/com/google/gerrit/server/account/GroupControl.java @@ -15,9 +15,9 @@ package com.google.gerrit.server.account; import com.google.common.flogger.FluentLogger; -import com.google.gerrit.common.data.GroupDescription; import com.google.gerrit.entities.Account; import com.google.gerrit.entities.AccountGroup; +import com.google.gerrit.entities.GroupDescription; import com.google.gerrit.exceptions.NoSuchGroupException; import com.google.gerrit.extensions.restapi.AuthException; import com.google.gerrit.server.CurrentUser; diff --git a/java/com/google/gerrit/server/account/InternalAccountUpdate.java b/java/com/google/gerrit/server/account/InternalAccountUpdate.java index bfbe9179da..4f9202f442 100644 --- a/java/com/google/gerrit/server/account/InternalAccountUpdate.java +++ b/java/com/google/gerrit/server/account/InternalAccountUpdate.java @@ -20,10 +20,10 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.gerrit.common.Nullable; import com.google.gerrit.entities.Account; +import com.google.gerrit.entities.NotifyConfig.NotifyType; import com.google.gerrit.extensions.client.DiffPreferencesInfo; import com.google.gerrit.extensions.client.EditPreferencesInfo; import com.google.gerrit.extensions.client.GeneralPreferencesInfo; -import com.google.gerrit.server.account.ProjectWatches.NotifyType; import com.google.gerrit.server.account.ProjectWatches.ProjectWatchKey; import com.google.gerrit.server.account.externalids.DuplicateExternalIdKeyException; import com.google.gerrit.server.account.externalids.ExternalId; diff --git a/java/com/google/gerrit/server/account/InternalGroupBackend.java b/java/com/google/gerrit/server/account/InternalGroupBackend.java index ddd3da20b4..c520c967b1 100644 --- a/java/com/google/gerrit/server/account/InternalGroupBackend.java +++ b/java/com/google/gerrit/server/account/InternalGroupBackend.java @@ -17,9 +17,9 @@ package com.google.gerrit.server.account; import static java.util.stream.Collectors.toList; import com.google.common.collect.ImmutableList; -import com.google.gerrit.common.data.GroupDescription; -import com.google.gerrit.common.data.GroupReference; import com.google.gerrit.entities.AccountGroup; +import com.google.gerrit.entities.GroupDescription; +import com.google.gerrit.entities.GroupReference; import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.server.group.InternalGroup; import com.google.gerrit.server.group.InternalGroupDescription; diff --git a/java/com/google/gerrit/server/account/ProjectWatches.java b/java/com/google/gerrit/server/account/ProjectWatches.java index 6d84f2071e..42137c16dd 100644 --- a/java/com/google/gerrit/server/account/ProjectWatches.java +++ b/java/com/google/gerrit/server/account/ProjectWatches.java @@ -31,6 +31,7 @@ import com.google.common.collect.MultimapBuilder; import com.google.common.collect.Sets; import com.google.gerrit.common.Nullable; import com.google.gerrit.entities.Account; +import com.google.gerrit.entities.NotifyConfig; import com.google.gerrit.entities.Project; import com.google.gerrit.server.git.ValidationError; import java.util.ArrayList; @@ -89,17 +90,6 @@ public class ProjectWatches { public abstract @Nullable String filter(); } - public enum NotifyType { - // sort by name, except 'ALL' which should stay last - ABANDONED_CHANGES, - ALL_COMMENTS, - NEW_CHANGES, - NEW_PATCHSETS, - SUBMITTED_CHANGES, - - ALL - } - public static final String FILTER_ALL = "*"; public static final String WATCH_CONFIG = "watch.config"; @@ -110,7 +100,7 @@ public class ProjectWatches { private final Config cfg; private final ValidationError.Sink validationErrorSink; - private ImmutableMap> projectWatches; + private ImmutableMap> projectWatches; ProjectWatches(Account.Id accountId, Config cfg, ValidationError.Sink validationErrorSink) { this.accountId = requireNonNull(accountId, "accountId"); @@ -118,7 +108,7 @@ public class ProjectWatches { this.validationErrorSink = requireNonNull(validationErrorSink, "validationErrorSink"); } - public ImmutableMap> getProjectWatches() { + public ImmutableMap> getProjectWatches() { if (projectWatches == null) { parse(); } @@ -152,9 +142,9 @@ public class ProjectWatches { * @return the parsed project watches */ @VisibleForTesting - public static ImmutableMap> parse( + public static ImmutableMap> parse( Account.Id accountId, Config cfg, ValidationError.Sink validationErrorSink) { - Map> projectWatches = new HashMap<>(); + Map> projectWatches = new HashMap<>(); for (String projectName : cfg.getSubsections(PROJECT)) { String[] notifyValues = cfg.getStringList(PROJECT, projectName, KEY_NOTIFY); for (String nv : notifyValues) { @@ -171,7 +161,7 @@ public class ProjectWatches { ProjectWatchKey key = ProjectWatchKey.create(Project.nameKey(projectName), notifyValue.filter()); if (!projectWatches.containsKey(key)) { - projectWatches.put(key, EnumSet.noneOf(NotifyType.class)); + projectWatches.put(key, EnumSet.noneOf(NotifyConfig.NotifyType.class)); } projectWatches.get(key).addAll(notifyValue.notifyTypes()); } @@ -179,7 +169,7 @@ public class ProjectWatches { return immutableCopyOf(projectWatches); } - public Config save(Map> projectWatches) { + public Config save(Map> projectWatches) { this.projectWatches = immutableCopyOf(projectWatches); for (String projectName : cfg.getSubsections(PROJECT)) { @@ -188,7 +178,7 @@ public class ProjectWatches { ListMultimap notifyValuesByProject = MultimapBuilder.hashKeys().arrayListValues().build(); - for (Map.Entry> e : projectWatches.entrySet()) { + for (Map.Entry> e : projectWatches.entrySet()) { NotifyValue notifyValue = NotifyValue.create(e.getKey().filter(), e.getValue()); notifyValuesByProject.put(e.getKey().project().get(), notifyValue.toString()); } @@ -200,9 +190,10 @@ public class ProjectWatches { return cfg; } - private static ImmutableMap> immutableCopyOf( - Map> projectWatches) { - ImmutableMap.Builder> b = ImmutableMap.builder(); + private static ImmutableMap> + immutableCopyOf(Map> projectWatches) { + ImmutableMap.Builder> b = + ImmutableMap.builder(); projectWatches.entrySet().stream() .forEach(e -> b.put(e.getKey(), ImmutableSet.copyOf(e.getValue()))); return b.build(); @@ -231,13 +222,14 @@ public class ProjectWatches { filter = null; } - Set notifyTypes = EnumSet.noneOf(NotifyType.class); + Set notifyTypes = EnumSet.noneOf(NotifyConfig.NotifyType.class); if (i + 1 < notifyValue.length() - 2) { for (String nt : Splitter.on(',') .trimResults() .splitToList(notifyValue.substring(i + 1, notifyValue.length() - 1))) { - NotifyType notifyType = Enums.getIfPresent(NotifyType.class, nt).orNull(); + NotifyConfig.NotifyType notifyType = + Enums.getIfPresent(NotifyConfig.NotifyType.class, nt).orNull(); if (notifyType == null) { validationErrorSink.error( ValidationError.create( @@ -254,18 +246,19 @@ public class ProjectWatches { return create(filter, notifyTypes); } - public static NotifyValue create(@Nullable String filter, Collection notifyTypes) { + public static NotifyValue create( + @Nullable String filter, Collection notifyTypes) { return new AutoValue_ProjectWatches_NotifyValue( Strings.emptyToNull(filter), Sets.immutableEnumSet(notifyTypes)); } public abstract @Nullable String filter(); - public abstract ImmutableSet notifyTypes(); + public abstract ImmutableSet notifyTypes(); @Override public final String toString() { - List notifyTypes = new ArrayList<>(notifyTypes()); + List notifyTypes = new ArrayList<>(notifyTypes()); StringBuilder notifyValue = new StringBuilder(); notifyValue.append(firstNonNull(filter(), FILTER_ALL)).append(" ["); Joiner.on(", ").appendTo(notifyValue, notifyTypes); diff --git a/java/com/google/gerrit/server/account/UniversalGroupBackend.java b/java/com/google/gerrit/server/account/UniversalGroupBackend.java index fddbd2ba01..a35b0accb0 100644 --- a/java/com/google/gerrit/server/account/UniversalGroupBackend.java +++ b/java/com/google/gerrit/server/account/UniversalGroupBackend.java @@ -24,9 +24,9 @@ import com.google.common.collect.MultimapBuilder; import com.google.common.collect.Sets; import com.google.common.flogger.FluentLogger; import com.google.gerrit.common.Nullable; -import com.google.gerrit.common.data.GroupDescription; -import com.google.gerrit.common.data.GroupReference; import com.google.gerrit.entities.AccountGroup; +import com.google.gerrit.entities.GroupDescription; +import com.google.gerrit.entities.GroupReference; import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.server.StartupCheck; import com.google.gerrit.server.StartupException; diff --git a/java/com/google/gerrit/server/args4j/AccountGroupUUIDHandler.java b/java/com/google/gerrit/server/args4j/AccountGroupUUIDHandler.java index 20e8441774..e88f6dffec 100644 --- a/java/com/google/gerrit/server/args4j/AccountGroupUUIDHandler.java +++ b/java/com/google/gerrit/server/args4j/AccountGroupUUIDHandler.java @@ -16,9 +16,9 @@ package com.google.gerrit.server.args4j; import static com.google.gerrit.util.cli.Localizable.localizable; -import com.google.gerrit.common.data.GroupDescription; -import com.google.gerrit.common.data.GroupReference; import com.google.gerrit.entities.AccountGroup; +import com.google.gerrit.entities.GroupDescription; +import com.google.gerrit.entities.GroupReference; import com.google.gerrit.server.account.GroupBackend; import com.google.gerrit.server.account.GroupBackends; import com.google.gerrit.server.account.GroupCache; diff --git a/java/com/google/gerrit/server/auth/ldap/FakeLdapGroupBackend.java b/java/com/google/gerrit/server/auth/ldap/FakeLdapGroupBackend.java index c2123cb53f..63cd426098 100644 --- a/java/com/google/gerrit/server/auth/ldap/FakeLdapGroupBackend.java +++ b/java/com/google/gerrit/server/auth/ldap/FakeLdapGroupBackend.java @@ -17,9 +17,9 @@ package com.google.gerrit.server.auth.ldap; import static com.google.gerrit.server.auth.ldap.Helper.LDAP_UUID; import com.google.gerrit.common.Nullable; -import com.google.gerrit.common.data.GroupDescription; -import com.google.gerrit.common.data.GroupReference; import com.google.gerrit.entities.AccountGroup; +import com.google.gerrit.entities.GroupDescription; +import com.google.gerrit.entities.GroupReference; import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.server.account.GroupBackend; import com.google.gerrit.server.account.GroupMembership; diff --git a/java/com/google/gerrit/server/auth/ldap/LdapGroupBackend.java b/java/com/google/gerrit/server/auth/ldap/LdapGroupBackend.java index e86439a188..180612c803 100644 --- a/java/com/google/gerrit/server/auth/ldap/LdapGroupBackend.java +++ b/java/com/google/gerrit/server/auth/ldap/LdapGroupBackend.java @@ -24,10 +24,10 @@ import com.google.common.cache.LoadingCache; import com.google.common.collect.Sets; import com.google.common.flogger.FluentLogger; import com.google.gerrit.common.Nullable; -import com.google.gerrit.common.data.GroupDescription; -import com.google.gerrit.common.data.GroupReference; import com.google.gerrit.common.data.ParameterizedString; import com.google.gerrit.entities.AccountGroup; +import com.google.gerrit.entities.GroupDescription; +import com.google.gerrit.entities.GroupReference; import com.google.gerrit.server.CurrentUser; import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.server.account.GroupBackend; diff --git a/java/com/google/gerrit/server/auth/ldap/LdapRealm.java b/java/com/google/gerrit/server/auth/ldap/LdapRealm.java index 1421f1792e..b5972e2995 100644 --- a/java/com/google/gerrit/server/auth/ldap/LdapRealm.java +++ b/java/com/google/gerrit/server/auth/ldap/LdapRealm.java @@ -20,10 +20,10 @@ import com.google.common.base.Strings; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; import com.google.common.flogger.FluentLogger; -import com.google.gerrit.common.data.GroupReference; import com.google.gerrit.common.data.ParameterizedString; import com.google.gerrit.entities.Account; import com.google.gerrit.entities.AccountGroup; +import com.google.gerrit.entities.GroupReference; import com.google.gerrit.extensions.client.AccountFieldName; import com.google.gerrit.extensions.client.AuthType; import com.google.gerrit.server.account.AbstractRealm; diff --git a/java/com/google/gerrit/server/cache/serialize/entities/GroupReferenceSerializer.java b/java/com/google/gerrit/server/cache/serialize/entities/GroupReferenceSerializer.java index e6481d9464..c5d4d07e03 100644 --- a/java/com/google/gerrit/server/cache/serialize/entities/GroupReferenceSerializer.java +++ b/java/com/google/gerrit/server/cache/serialize/entities/GroupReferenceSerializer.java @@ -14,8 +14,8 @@ package com.google.gerrit.server.cache.serialize.entities; -import com.google.gerrit.common.data.GroupReference; import com.google.gerrit.entities.AccountGroup; +import com.google.gerrit.entities.GroupReference; 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/NotifyConfigSerializer.java b/java/com/google/gerrit/server/cache/serialize/entities/NotifyConfigSerializer.java new file mode 100644 index 0000000000..f0f7d905b4 --- /dev/null +++ b/java/com/google/gerrit/server/cache/serialize/entities/NotifyConfigSerializer.java @@ -0,0 +1,79 @@ +// 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.base.Strings.emptyToNull; +import static com.google.common.base.Strings.nullToEmpty; +import static com.google.common.collect.ImmutableList.toImmutableList; +import static com.google.common.collect.ImmutableSet.toImmutableSet; + +import com.google.common.base.Converter; +import com.google.common.base.Enums; +import com.google.gerrit.entities.NotifyConfig; +import com.google.gerrit.server.cache.proto.Cache; + +/** Helper to (de)serialize values for caches. */ +public class NotifyConfigSerializer { + private static final Converter HEADER_CONVERTER = + Enums.stringConverter(NotifyConfig.Header.class); + + private static final Converter NOTIFY_TYPE_CONVERTER = + Enums.stringConverter(NotifyConfig.NotifyType.class); + + public static NotifyConfig deserialize(Cache.NotifyConfigProto proto) { + NotifyConfig.Builder builder = + NotifyConfig.builder() + .setName(emptyToNull(proto.getName())) + .setNotify( + proto.getTypeList().stream() + .map(t -> NOTIFY_TYPE_CONVERTER.convert(t)) + .collect(toImmutableSet())) + .setFilter(emptyToNull(proto.getFilter())) + .setHeader( + proto.getHeader().isEmpty() ? null : HEADER_CONVERTER.convert(proto.getHeader())); + proto.getGroupsList().stream() + .map(GroupReferenceSerializer::deserialize) + .forEach(g -> builder.addGroup(g)); + proto.getAddressesList().stream() + .map(AddressSerializer::deserialize) + .forEach(a -> builder.addAddress(a)); + return builder.build(); + } + + public static Cache.NotifyConfigProto serialize(NotifyConfig autoValue) { + return Cache.NotifyConfigProto.newBuilder() + .setName(nullToEmpty(autoValue.getName())) + .addAllType( + autoValue.getNotify().stream() + .map(t -> NOTIFY_TYPE_CONVERTER.reverse().convert(t)) + .collect(toImmutableSet())) + .setFilter(nullToEmpty(autoValue.getFilter())) + .setHeader( + autoValue.getHeader() == null + ? "" + : HEADER_CONVERTER.reverse().convert(autoValue.getHeader())) + .addAllGroups( + autoValue.getGroups().stream() + .map(GroupReferenceSerializer::serialize) + .collect(toImmutableSet())) + .addAllAddresses( + autoValue.getAddresses().stream() + .map(AddressSerializer::serialize) + .collect(toImmutableList())) + .build(); + } + + private NotifyConfigSerializer() {} +} diff --git a/java/com/google/gerrit/server/change/ReviewerAdder.java b/java/com/google/gerrit/server/change/ReviewerAdder.java index ae0c38ca44..c271651b2c 100644 --- a/java/com/google/gerrit/server/change/ReviewerAdder.java +++ b/java/com/google/gerrit/server/change/ReviewerAdder.java @@ -31,13 +31,13 @@ import com.google.common.collect.Ordering; import com.google.common.collect.Streams; import com.google.common.flogger.FluentLogger; import com.google.gerrit.common.Nullable; -import com.google.gerrit.common.data.GroupDescription; import com.google.gerrit.entities.Account; import com.google.gerrit.entities.AccountGroup; import com.google.gerrit.entities.Address; import com.google.gerrit.entities.BooleanProjectConfig; import com.google.gerrit.entities.BranchNameKey; import com.google.gerrit.entities.Change; +import com.google.gerrit.entities.GroupDescription; import com.google.gerrit.entities.PatchSet; import com.google.gerrit.entities.PatchSetApproval; import com.google.gerrit.extensions.api.changes.AddReviewerInput; diff --git a/java/com/google/gerrit/server/config/AdministrateServerGroupsProvider.java b/java/com/google/gerrit/server/config/AdministrateServerGroupsProvider.java index d6e61c40f5..64937db29d 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.GroupReference; import com.google.gerrit.common.data.PermissionRule; +import com.google.gerrit.entities.GroupReference; 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/config/GroupSetProvider.java b/java/com/google/gerrit/server/config/GroupSetProvider.java index 7f487e1b89..025946d893 100644 --- a/java/com/google/gerrit/server/config/GroupSetProvider.java +++ b/java/com/google/gerrit/server/config/GroupSetProvider.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.GroupReference; import com.google.gerrit.entities.AccountGroup; +import com.google.gerrit.entities.GroupReference; 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/config/PluginConfig.java b/java/com/google/gerrit/server/config/PluginConfig.java index f41d5c25d9..0eebd98009 100644 --- a/java/com/google/gerrit/server/config/PluginConfig.java +++ b/java/com/google/gerrit/server/config/PluginConfig.java @@ -17,7 +17,7 @@ package com.google.gerrit.server.config; import com.google.common.base.MoreObjects; import com.google.common.base.Strings; import com.google.common.collect.Iterables; -import com.google.gerrit.common.data.GroupReference; +import com.google.gerrit.entities.GroupReference; import com.google.gerrit.server.project.ProjectConfig; import com.google.gerrit.server.project.ProjectState; import java.util.Arrays; diff --git a/java/com/google/gerrit/server/group/GroupResolver.java b/java/com/google/gerrit/server/group/GroupResolver.java index 1aa265b0be..50ec8936b0 100644 --- a/java/com/google/gerrit/server/group/GroupResolver.java +++ b/java/com/google/gerrit/server/group/GroupResolver.java @@ -15,9 +15,9 @@ package com.google.gerrit.server.group; import com.google.common.flogger.FluentLogger; -import com.google.gerrit.common.data.GroupDescription; -import com.google.gerrit.common.data.GroupReference; import com.google.gerrit.entities.AccountGroup; +import com.google.gerrit.entities.GroupDescription; +import com.google.gerrit.entities.GroupReference; import com.google.gerrit.extensions.restapi.UnprocessableEntityException; import com.google.gerrit.server.account.GroupBackend; import com.google.gerrit.server.account.GroupBackends; diff --git a/java/com/google/gerrit/server/group/GroupResource.java b/java/com/google/gerrit/server/group/GroupResource.java index 1050314270..b0e81ec3a5 100644 --- a/java/com/google/gerrit/server/group/GroupResource.java +++ b/java/com/google/gerrit/server/group/GroupResource.java @@ -14,7 +14,7 @@ package com.google.gerrit.server.group; -import com.google.gerrit.common.data.GroupDescription; +import com.google.gerrit.entities.GroupDescription; import com.google.gerrit.extensions.restapi.RestResource; import com.google.gerrit.extensions.restapi.RestView; import com.google.gerrit.server.account.GroupControl; diff --git a/java/com/google/gerrit/server/group/InternalGroupDescription.java b/java/com/google/gerrit/server/group/InternalGroupDescription.java index c70c8bf9a4..740557ab38 100644 --- a/java/com/google/gerrit/server/group/InternalGroupDescription.java +++ b/java/com/google/gerrit/server/group/InternalGroupDescription.java @@ -19,9 +19,9 @@ import static java.util.Objects.requireNonNull; import com.google.common.collect.ImmutableSet; import com.google.gerrit.common.Nullable; import com.google.gerrit.common.PageLinks; -import com.google.gerrit.common.data.GroupDescription; import com.google.gerrit.entities.Account; import com.google.gerrit.entities.AccountGroup; +import com.google.gerrit.entities.GroupDescription; import java.sql.Timestamp; public class InternalGroupDescription implements GroupDescription.Internal { diff --git a/java/com/google/gerrit/server/group/PeriodicGroupIndexer.java b/java/com/google/gerrit/server/group/PeriodicGroupIndexer.java index b2d9632122..cae213f32b 100644 --- a/java/com/google/gerrit/server/group/PeriodicGroupIndexer.java +++ b/java/com/google/gerrit/server/group/PeriodicGroupIndexer.java @@ -19,8 +19,8 @@ import static com.google.common.collect.ImmutableSet.toImmutableSet; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; import com.google.common.flogger.FluentLogger; -import com.google.gerrit.common.data.GroupReference; import com.google.gerrit.entities.AccountGroup; +import com.google.gerrit.entities.GroupReference; import com.google.gerrit.extensions.events.LifecycleListener; import com.google.gerrit.lifecycle.LifecycleModule; import com.google.gerrit.server.config.AllUsersName; diff --git a/java/com/google/gerrit/server/group/SubgroupResource.java b/java/com/google/gerrit/server/group/SubgroupResource.java index ceea2dc81d..21356be65c 100644 --- a/java/com/google/gerrit/server/group/SubgroupResource.java +++ b/java/com/google/gerrit/server/group/SubgroupResource.java @@ -14,8 +14,8 @@ package com.google.gerrit.server.group; -import com.google.gerrit.common.data.GroupDescription; import com.google.gerrit.entities.AccountGroup; +import com.google.gerrit.entities.GroupDescription; import com.google.gerrit.extensions.restapi.RestView; import com.google.inject.TypeLiteral; diff --git a/java/com/google/gerrit/server/group/SystemGroupBackend.java b/java/com/google/gerrit/server/group/SystemGroupBackend.java index a44671811e..b5ccb18016 100644 --- a/java/com/google/gerrit/server/group/SystemGroupBackend.java +++ b/java/com/google/gerrit/server/group/SystemGroupBackend.java @@ -21,9 +21,9 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.base.MoreObjects; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -import com.google.gerrit.common.data.GroupDescription; -import com.google.gerrit.common.data.GroupReference; import com.google.gerrit.entities.AccountGroup; +import com.google.gerrit.entities.GroupDescription; +import com.google.gerrit.entities.GroupReference; import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.server.StartupCheck; import com.google.gerrit.server.StartupException; diff --git a/java/com/google/gerrit/server/group/db/AuditLogFormatter.java b/java/com/google/gerrit/server/group/db/AuditLogFormatter.java index ec4c0fcbe3..235ca4f613 100644 --- a/java/com/google/gerrit/server/group/db/AuditLogFormatter.java +++ b/java/com/google/gerrit/server/group/db/AuditLogFormatter.java @@ -19,9 +19,9 @@ import static java.util.Objects.requireNonNull; import com.google.common.collect.ImmutableSet; import com.google.gerrit.common.Nullable; -import com.google.gerrit.common.data.GroupDescription; import com.google.gerrit.entities.Account; import com.google.gerrit.entities.AccountGroup; +import com.google.gerrit.entities.GroupDescription; import com.google.gerrit.server.account.AccountCache; import com.google.gerrit.server.account.AccountState; import com.google.gerrit.server.account.GroupBackend; diff --git a/java/com/google/gerrit/server/group/db/GroupNameNotes.java b/java/com/google/gerrit/server/group/db/GroupNameNotes.java index b75670d654..cdba81fb2c 100644 --- a/java/com/google/gerrit/server/group/db/GroupNameNotes.java +++ b/java/com/google/gerrit/server/group/db/GroupNameNotes.java @@ -28,8 +28,8 @@ import com.google.common.collect.Multiset; import com.google.common.flogger.FluentLogger; import com.google.common.hash.Hashing; import com.google.gerrit.common.Nullable; -import com.google.gerrit.common.data.GroupReference; import com.google.gerrit.entities.AccountGroup; +import com.google.gerrit.entities.GroupReference; import com.google.gerrit.entities.Project; import com.google.gerrit.entities.RefNames; import com.google.gerrit.exceptions.DuplicateKeyException; diff --git a/java/com/google/gerrit/server/group/db/Groups.java b/java/com/google/gerrit/server/group/db/Groups.java index 163b9c6b0c..90a5a1f305 100644 --- a/java/com/google/gerrit/server/group/db/Groups.java +++ b/java/com/google/gerrit/server/group/db/Groups.java @@ -17,10 +17,10 @@ package com.google.gerrit.server.group.db; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.flogger.FluentLogger; -import com.google.gerrit.common.data.GroupReference; import com.google.gerrit.entities.AccountGroup; import com.google.gerrit.entities.AccountGroupByIdAudit; import com.google.gerrit.entities.AccountGroupMemberAudit; +import com.google.gerrit.entities.GroupReference; import com.google.gerrit.server.config.AllUsersName; import com.google.gerrit.server.git.GitRepositoryManager; import com.google.gerrit.server.group.InternalGroup; diff --git a/java/com/google/gerrit/server/group/db/GroupsNoteDbConsistencyChecker.java b/java/com/google/gerrit/server/group/db/GroupsNoteDbConsistencyChecker.java index 04143044cf..35f5dea97a 100644 --- a/java/com/google/gerrit/server/group/db/GroupsNoteDbConsistencyChecker.java +++ b/java/com/google/gerrit/server/group/db/GroupsNoteDbConsistencyChecker.java @@ -23,8 +23,8 @@ import com.google.common.collect.HashBiMap; import com.google.common.collect.ImmutableList; import com.google.common.flogger.FluentLogger; import com.google.gerrit.common.Nullable; -import com.google.gerrit.common.data.GroupReference; import com.google.gerrit.entities.AccountGroup; +import com.google.gerrit.entities.GroupReference; import com.google.gerrit.entities.RefNames; import com.google.gerrit.extensions.api.config.ConsistencyCheckInfo; import com.google.gerrit.extensions.api.config.ConsistencyCheckInfo.ConsistencyProblemInfo; diff --git a/java/com/google/gerrit/server/group/db/RenameGroupOp.java b/java/com/google/gerrit/server/group/db/RenameGroupOp.java index b7564e29dd..45dcdfc069 100644 --- a/java/com/google/gerrit/server/group/db/RenameGroupOp.java +++ b/java/com/google/gerrit/server/group/db/RenameGroupOp.java @@ -17,8 +17,8 @@ package com.google.gerrit.server.group.db; import static com.google.gerrit.server.project.ProjectCache.illegalState; import com.google.common.flogger.FluentLogger; -import com.google.gerrit.common.data.GroupReference; import com.google.gerrit.entities.AccountGroup; +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; diff --git a/java/com/google/gerrit/server/group/testing/TestGroupBackend.java b/java/com/google/gerrit/server/group/testing/TestGroupBackend.java index 51c7ca3a0a..8b7055e45f 100644 --- a/java/com/google/gerrit/server/group/testing/TestGroupBackend.java +++ b/java/com/google/gerrit/server/group/testing/TestGroupBackend.java @@ -18,9 +18,9 @@ import static com.google.common.base.Preconditions.checkState; import static java.util.Objects.requireNonNull; import com.google.common.collect.ImmutableList; -import com.google.gerrit.common.data.GroupDescription; -import com.google.gerrit.common.data.GroupReference; import com.google.gerrit.entities.AccountGroup; +import com.google.gerrit.entities.GroupDescription; +import com.google.gerrit.entities.GroupReference; import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.server.account.GroupBackend; import com.google.gerrit.server.account.GroupMembership; diff --git a/java/com/google/gerrit/server/index/group/AllGroupsIndexer.java b/java/com/google/gerrit/server/index/group/AllGroupsIndexer.java index 51c7730640..2d77f61e74 100644 --- a/java/com/google/gerrit/server/index/group/AllGroupsIndexer.java +++ b/java/com/google/gerrit/server/index/group/AllGroupsIndexer.java @@ -22,8 +22,8 @@ import com.google.common.flogger.FluentLogger; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; -import com.google.gerrit.common.data.GroupReference; import com.google.gerrit.entities.AccountGroup; +import com.google.gerrit.entities.GroupReference; import com.google.gerrit.index.SiteIndexer; import com.google.gerrit.server.account.GroupCache; import com.google.gerrit.server.group.InternalGroup; diff --git a/java/com/google/gerrit/server/mail/send/AbandonedSender.java b/java/com/google/gerrit/server/mail/send/AbandonedSender.java index 2b98a1b160..3ac610dc85 100644 --- a/java/com/google/gerrit/server/mail/send/AbandonedSender.java +++ b/java/com/google/gerrit/server/mail/send/AbandonedSender.java @@ -15,9 +15,9 @@ package com.google.gerrit.server.mail.send; import com.google.gerrit.entities.Change; +import com.google.gerrit.entities.NotifyConfig.NotifyType; import com.google.gerrit.entities.Project; import com.google.gerrit.exceptions.EmailException; -import com.google.gerrit.server.account.ProjectWatches.NotifyType; import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; diff --git a/java/com/google/gerrit/server/mail/send/ChangeEmail.java b/java/com/google/gerrit/server/mail/send/ChangeEmail.java index 22d332ace0..1e984c1f68 100644 --- a/java/com/google/gerrit/server/mail/send/ChangeEmail.java +++ b/java/com/google/gerrit/server/mail/send/ChangeEmail.java @@ -22,6 +22,7 @@ import com.google.common.flogger.FluentLogger; import com.google.gerrit.common.Nullable; import com.google.gerrit.entities.Account; import com.google.gerrit.entities.Change; +import com.google.gerrit.entities.NotifyConfig.NotifyType; import com.google.gerrit.entities.Patch; import com.google.gerrit.entities.PatchSet; import com.google.gerrit.entities.PatchSetInfo; @@ -33,7 +34,6 @@ import com.google.gerrit.extensions.api.changes.RecipientType; import com.google.gerrit.extensions.restapi.AuthException; import com.google.gerrit.mail.MailHeader; import com.google.gerrit.server.StarredChangesUtil; -import com.google.gerrit.server.account.ProjectWatches.NotifyType; import com.google.gerrit.server.mail.send.ProjectWatch.Watchers; import com.google.gerrit.server.notedb.ReviewerStateInternal; import com.google.gerrit.server.patch.PatchList; diff --git a/java/com/google/gerrit/server/mail/send/CommentSender.java b/java/com/google/gerrit/server/mail/send/CommentSender.java index 7cbe2c0e56..7d5f3fafa8 100644 --- a/java/com/google/gerrit/server/mail/send/CommentSender.java +++ b/java/com/google/gerrit/server/mail/send/CommentSender.java @@ -24,6 +24,7 @@ import com.google.gerrit.entities.Change; import com.google.gerrit.entities.Comment; import com.google.gerrit.entities.HumanComment; import com.google.gerrit.entities.KeyUtil; +import com.google.gerrit.entities.NotifyConfig.NotifyType; import com.google.gerrit.entities.Patch; import com.google.gerrit.entities.Project; import com.google.gerrit.entities.RobotComment; @@ -34,7 +35,6 @@ import com.google.gerrit.extensions.api.changes.NotifyHandling; import com.google.gerrit.mail.MailHeader; import com.google.gerrit.mail.MailProcessingUtil; import com.google.gerrit.server.CommentsUtil; -import com.google.gerrit.server.account.ProjectWatches.NotifyType; import com.google.gerrit.server.config.GerritServerConfig; import com.google.gerrit.server.mail.receive.Protocol; import com.google.gerrit.server.patch.PatchFile; diff --git a/java/com/google/gerrit/server/mail/send/CreateChangeSender.java b/java/com/google/gerrit/server/mail/send/CreateChangeSender.java index 1f58abb2ce..b78dc62ce7 100644 --- a/java/com/google/gerrit/server/mail/send/CreateChangeSender.java +++ b/java/com/google/gerrit/server/mail/send/CreateChangeSender.java @@ -17,11 +17,11 @@ package com.google.gerrit.server.mail.send; import com.google.common.flogger.FluentLogger; import com.google.gerrit.entities.Account; import com.google.gerrit.entities.Change; +import com.google.gerrit.entities.NotifyConfig.NotifyType; import com.google.gerrit.entities.Project; import com.google.gerrit.exceptions.EmailException; import com.google.gerrit.exceptions.StorageException; import com.google.gerrit.extensions.api.changes.RecipientType; -import com.google.gerrit.server.account.ProjectWatches.NotifyType; import com.google.gerrit.server.mail.send.ProjectWatch.Watchers; import com.google.gerrit.server.permissions.PermissionBackend; import com.google.gerrit.server.permissions.RefPermission; diff --git a/java/com/google/gerrit/server/mail/send/DeleteReviewerSender.java b/java/com/google/gerrit/server/mail/send/DeleteReviewerSender.java index 3e2392440a..d5863a627c 100644 --- a/java/com/google/gerrit/server/mail/send/DeleteReviewerSender.java +++ b/java/com/google/gerrit/server/mail/send/DeleteReviewerSender.java @@ -17,10 +17,10 @@ package com.google.gerrit.server.mail.send; import com.google.gerrit.entities.Account; import com.google.gerrit.entities.Address; import com.google.gerrit.entities.Change; +import com.google.gerrit.entities.NotifyConfig.NotifyType; import com.google.gerrit.entities.Project; import com.google.gerrit.exceptions.EmailException; import com.google.gerrit.extensions.api.changes.RecipientType; -import com.google.gerrit.server.account.ProjectWatches.NotifyType; import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; import java.util.ArrayList; diff --git a/java/com/google/gerrit/server/mail/send/DeleteVoteSender.java b/java/com/google/gerrit/server/mail/send/DeleteVoteSender.java index c0df0f67eb..77efbf82f4 100644 --- a/java/com/google/gerrit/server/mail/send/DeleteVoteSender.java +++ b/java/com/google/gerrit/server/mail/send/DeleteVoteSender.java @@ -15,9 +15,9 @@ package com.google.gerrit.server.mail.send; import com.google.gerrit.entities.Change; +import com.google.gerrit.entities.NotifyConfig.NotifyType; import com.google.gerrit.entities.Project; import com.google.gerrit.exceptions.EmailException; -import com.google.gerrit.server.account.ProjectWatches.NotifyType; import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; diff --git a/java/com/google/gerrit/server/mail/send/MergedSender.java b/java/com/google/gerrit/server/mail/send/MergedSender.java index e5efe80311..f17e84eb03 100644 --- a/java/com/google/gerrit/server/mail/send/MergedSender.java +++ b/java/com/google/gerrit/server/mail/send/MergedSender.java @@ -21,11 +21,11 @@ import com.google.gerrit.common.data.LabelTypes; import com.google.gerrit.common.data.LabelValue; import com.google.gerrit.entities.Account; import com.google.gerrit.entities.Change; +import com.google.gerrit.entities.NotifyConfig.NotifyType; import com.google.gerrit.entities.PatchSetApproval; import com.google.gerrit.entities.Project; import com.google.gerrit.exceptions.EmailException; import com.google.gerrit.exceptions.StorageException; -import com.google.gerrit.server.account.ProjectWatches.NotifyType; import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; diff --git a/java/com/google/gerrit/server/mail/send/NotificationEmail.java b/java/com/google/gerrit/server/mail/send/NotificationEmail.java index f060a1c763..5ffd9284b7 100644 --- a/java/com/google/gerrit/server/mail/send/NotificationEmail.java +++ b/java/com/google/gerrit/server/mail/send/NotificationEmail.java @@ -20,11 +20,11 @@ import com.google.common.flogger.FluentLogger; import com.google.gerrit.entities.Account; import com.google.gerrit.entities.Address; import com.google.gerrit.entities.BranchNameKey; +import com.google.gerrit.entities.NotifyConfig.NotifyType; import com.google.gerrit.exceptions.EmailException; import com.google.gerrit.exceptions.StorageException; import com.google.gerrit.extensions.api.changes.RecipientType; import com.google.gerrit.mail.MailHeader; -import com.google.gerrit.server.account.ProjectWatches.NotifyType; import com.google.gerrit.server.mail.send.ProjectWatch.Watchers; import java.util.HashMap; import java.util.Map; diff --git a/java/com/google/gerrit/server/mail/send/ProjectWatch.java b/java/com/google/gerrit/server/mail/send/ProjectWatch.java index d975f4f8da..051433799d 100644 --- a/java/com/google/gerrit/server/mail/send/ProjectWatch.java +++ b/java/com/google/gerrit/server/mail/send/ProjectWatch.java @@ -17,20 +17,19 @@ package com.google.gerrit.server.mail.send; import com.google.common.base.Strings; import com.google.common.collect.ImmutableSet; import com.google.common.flogger.FluentLogger; -import com.google.gerrit.common.data.GroupDescription; -import com.google.gerrit.common.data.GroupReference; import com.google.gerrit.entities.Account; import com.google.gerrit.entities.AccountGroup; import com.google.gerrit.entities.Address; +import com.google.gerrit.entities.GroupDescription; +import com.google.gerrit.entities.GroupReference; +import com.google.gerrit.entities.NotifyConfig; import com.google.gerrit.entities.Project; import com.google.gerrit.index.query.Predicate; import com.google.gerrit.index.query.QueryParseException; import com.google.gerrit.server.CurrentUser; import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.server.account.AccountState; -import com.google.gerrit.server.account.ProjectWatches.NotifyType; import com.google.gerrit.server.account.ProjectWatches.ProjectWatchKey; -import com.google.gerrit.server.git.NotifyConfig; import com.google.gerrit.server.project.ProjectState; import com.google.gerrit.server.query.change.ChangeData; import com.google.gerrit.server.query.change.ChangeQueryBuilder; @@ -61,13 +60,15 @@ public class ProjectWatch { } /** Returns all watchers that are relevant */ - public final Watchers getWatchers(NotifyType type, boolean includeWatchersFromNotifyConfig) { + public final Watchers getWatchers( + NotifyConfig.NotifyType type, boolean includeWatchersFromNotifyConfig) { Watchers matching = new Watchers(); Set projectWatchers = new HashSet<>(); for (AccountState a : args.accountQueryProvider.get().byWatchedProject(project)) { Account.Id accountId = a.account().id(); - for (Map.Entry> e : a.projectWatches().entrySet()) { + for (Map.Entry> e : + a.projectWatches().entrySet()) { if (project.equals(e.getKey().project()) && add(matching, accountId, e.getKey(), e.getValue(), type)) { // We only want to prevent matching All-Projects if this filter hits @@ -77,7 +78,8 @@ public class ProjectWatch { } for (AccountState a : args.accountQueryProvider.get().byWatchedProject(args.allProjectsName)) { - for (Map.Entry> e : a.projectWatches().entrySet()) { + for (Map.Entry> e : + a.projectWatches().entrySet()) { if (args.allProjectsName.equals(e.getKey().project())) { Account.Id accountId = a.account().id(); if (!projectWatchers.contains(accountId)) { @@ -212,8 +214,8 @@ public class ProjectWatch { Watchers matching, Account.Id accountId, ProjectWatchKey key, - Set watchedTypes, - NotifyType type) { + Set watchedTypes, + NotifyConfig.NotifyType type) { logger.atFine().log("Checking project watch %s of account %s", key, accountId); IdentifiedUser user = args.identifiedUserFactory.create(accountId); diff --git a/java/com/google/gerrit/server/mail/send/ReplacePatchSetSender.java b/java/com/google/gerrit/server/mail/send/ReplacePatchSetSender.java index 8e6c9ae5c9..274e664d98 100644 --- a/java/com/google/gerrit/server/mail/send/ReplacePatchSetSender.java +++ b/java/com/google/gerrit/server/mail/send/ReplacePatchSetSender.java @@ -16,11 +16,11 @@ package com.google.gerrit.server.mail.send; import com.google.gerrit.entities.Account; import com.google.gerrit.entities.Change; +import com.google.gerrit.entities.NotifyConfig.NotifyType; import com.google.gerrit.entities.Project; import com.google.gerrit.exceptions.EmailException; import com.google.gerrit.extensions.api.changes.NotifyHandling; import com.google.gerrit.extensions.api.changes.RecipientType; -import com.google.gerrit.server.account.ProjectWatches.NotifyType; import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; import java.util.ArrayList; diff --git a/java/com/google/gerrit/server/mail/send/RestoredSender.java b/java/com/google/gerrit/server/mail/send/RestoredSender.java index b4db60eb1d..ffe70cf13b 100644 --- a/java/com/google/gerrit/server/mail/send/RestoredSender.java +++ b/java/com/google/gerrit/server/mail/send/RestoredSender.java @@ -15,9 +15,9 @@ package com.google.gerrit.server.mail.send; import com.google.gerrit.entities.Change; +import com.google.gerrit.entities.NotifyConfig.NotifyType; import com.google.gerrit.entities.Project; import com.google.gerrit.exceptions.EmailException; -import com.google.gerrit.server.account.ProjectWatches.NotifyType; import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; diff --git a/java/com/google/gerrit/server/mail/send/RevertedSender.java b/java/com/google/gerrit/server/mail/send/RevertedSender.java index 40fdb6035f..c11529b2a4 100644 --- a/java/com/google/gerrit/server/mail/send/RevertedSender.java +++ b/java/com/google/gerrit/server/mail/send/RevertedSender.java @@ -15,9 +15,9 @@ package com.google.gerrit.server.mail.send; import com.google.gerrit.entities.Change; +import com.google.gerrit.entities.NotifyConfig.NotifyType; import com.google.gerrit.entities.Project; import com.google.gerrit.exceptions.EmailException; -import com.google.gerrit.server.account.ProjectWatches.NotifyType; import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; diff --git a/java/com/google/gerrit/server/project/AccessControlModule.java b/java/com/google/gerrit/server/project/AccessControlModule.java index 89ab8ee27d..ecad4e10ce 100644 --- a/java/com/google/gerrit/server/project/AccessControlModule.java +++ b/java/com/google/gerrit/server/project/AccessControlModule.java @@ -17,8 +17,8 @@ package com.google.gerrit.server.project; import static com.google.inject.Scopes.SINGLETON; import com.google.common.collect.ImmutableSet; -import com.google.gerrit.common.data.GroupReference; import com.google.gerrit.entities.AccountGroup; +import com.google.gerrit.entities.GroupReference; import com.google.gerrit.extensions.config.FactoryModule; import com.google.gerrit.server.config.AdministrateServerGroups; import com.google.gerrit.server.config.AdministrateServerGroupsProvider; diff --git a/java/com/google/gerrit/server/project/CachedProjectConfig.java b/java/com/google/gerrit/server/project/CachedProjectConfig.java index 2ee746c790..308053cd6a 100644 --- a/java/com/google/gerrit/server/project/CachedProjectConfig.java +++ b/java/com/google/gerrit/server/project/CachedProjectConfig.java @@ -20,14 +20,14 @@ 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.GroupReference; 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.GroupReference; +import com.google.gerrit.entities.NotifyConfig; import com.google.gerrit.entities.Project; -import com.google.gerrit.server.git.NotifyConfig; import java.util.Collection; import java.util.List; import java.util.Map; diff --git a/java/com/google/gerrit/server/project/GroupList.java b/java/com/google/gerrit/server/project/GroupList.java index 33c73e8bd5..98dc44a97a 100644 --- a/java/com/google/gerrit/server/project/GroupList.java +++ b/java/com/google/gerrit/server/project/GroupList.java @@ -16,8 +16,8 @@ package com.google.gerrit.server.project; import com.google.common.flogger.FluentLogger; import com.google.gerrit.common.Nullable; -import com.google.gerrit.common.data.GroupReference; import com.google.gerrit.entities.AccountGroup; +import com.google.gerrit.entities.GroupReference; import com.google.gerrit.entities.Project; import com.google.gerrit.server.git.ValidationError; import com.google.gerrit.server.git.meta.TabFile; diff --git a/java/com/google/gerrit/server/project/ProjectConfig.java b/java/com/google/gerrit/server/project/ProjectConfig.java index d287ef8175..32beb94058 100644 --- a/java/com/google/gerrit/server/project/ProjectConfig.java +++ b/java/com/google/gerrit/server/project/ProjectConfig.java @@ -36,8 +36,6 @@ 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.GroupDescription; -import com.google.gerrit.common.data.GroupReference; import com.google.gerrit.common.data.LabelFunction; import com.google.gerrit.common.data.LabelType; import com.google.gerrit.common.data.LabelValue; @@ -49,18 +47,20 @@ import com.google.gerrit.entities.AccountGroup; import com.google.gerrit.entities.Address; import com.google.gerrit.entities.BooleanProjectConfig; import com.google.gerrit.entities.BranchOrderSection; +import com.google.gerrit.entities.GroupDescription; +import com.google.gerrit.entities.GroupReference; +import com.google.gerrit.entities.NotifyConfig; +import com.google.gerrit.entities.NotifyConfig.NotifyType; import com.google.gerrit.entities.Project; import com.google.gerrit.entities.RefNames; import com.google.gerrit.exceptions.InvalidNameException; import com.google.gerrit.extensions.client.InheritableBoolean; import com.google.gerrit.extensions.client.ProjectState; import com.google.gerrit.server.account.GroupBackend; -import com.google.gerrit.server.account.ProjectWatches.NotifyType; import com.google.gerrit.server.config.AllProjectsName; import com.google.gerrit.server.config.ConfigUtil; import com.google.gerrit.server.config.PluginConfig; import com.google.gerrit.server.config.SitePaths; -import com.google.gerrit.server.git.NotifyConfig; import com.google.gerrit.server.git.ValidationError; import com.google.gerrit.server.git.meta.MetaDataUpdate; import com.google.gerrit.server.git.meta.VersionedMetaData; diff --git a/java/com/google/gerrit/server/project/ProjectCreator.java b/java/com/google/gerrit/server/project/ProjectCreator.java index fa0a262eb2..19c3afb310 100644 --- a/java/com/google/gerrit/server/project/ProjectCreator.java +++ b/java/com/google/gerrit/server/project/ProjectCreator.java @@ -20,12 +20,12 @@ 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.GroupDescription; -import com.google.gerrit.common.data.GroupReference; import com.google.gerrit.common.data.Permission; import com.google.gerrit.common.data.PermissionRule; 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.Project; import com.google.gerrit.entities.RefNames; import com.google.gerrit.extensions.events.NewProjectCreatedListener; diff --git a/java/com/google/gerrit/server/project/ProjectState.java b/java/com/google/gerrit/server/project/ProjectState.java index a4dd6c61f2..69b4c65e3c 100644 --- a/java/com/google/gerrit/server/project/ProjectState.java +++ b/java/com/google/gerrit/server/project/ProjectState.java @@ -22,7 +22,6 @@ 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.GroupReference; import com.google.gerrit.common.data.LabelType; import com.google.gerrit.common.data.LabelTypes; import com.google.gerrit.common.data.Permission; @@ -32,6 +31,7 @@ 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.GroupReference; import com.google.gerrit.entities.Project; import com.google.gerrit.extensions.api.projects.CommentLinkInfo; import com.google.gerrit.extensions.client.SubmitType; diff --git a/java/com/google/gerrit/server/query/change/ChangeQueryBuilder.java b/java/com/google/gerrit/server/query/change/ChangeQueryBuilder.java index d539594ed3..2681b6d7c0 100644 --- a/java/com/google/gerrit/server/query/change/ChangeQueryBuilder.java +++ b/java/com/google/gerrit/server/query/change/ChangeQueryBuilder.java @@ -28,14 +28,14 @@ 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.GroupDescription; -import com.google.gerrit.common.data.GroupReference; 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; import com.google.gerrit.entities.BranchNameKey; import com.google.gerrit.entities.Change; +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.exceptions.NotSignedInException; diff --git a/java/com/google/gerrit/server/query/group/GroupQueryBuilder.java b/java/com/google/gerrit/server/query/group/GroupQueryBuilder.java index 4e60db5dbe..fbc8d0e995 100644 --- a/java/com/google/gerrit/server/query/group/GroupQueryBuilder.java +++ b/java/com/google/gerrit/server/query/group/GroupQueryBuilder.java @@ -19,9 +19,9 @@ import static com.google.common.collect.ImmutableList.toImmutableList; import com.google.common.base.Strings; import com.google.common.collect.Lists; import com.google.common.primitives.Ints; -import com.google.gerrit.common.data.GroupReference; import com.google.gerrit.entities.Account; import com.google.gerrit.entities.AccountGroup; +import com.google.gerrit.entities.GroupReference; import com.google.gerrit.index.query.LimitPredicate; import com.google.gerrit.index.query.Predicate; import com.google.gerrit.index.query.QueryBuilder; diff --git a/java/com/google/gerrit/server/restapi/account/CreateAccount.java b/java/com/google/gerrit/server/restapi/account/CreateAccount.java index 907dd18f75..015b235081 100644 --- a/java/com/google/gerrit/server/restapi/account/CreateAccount.java +++ b/java/com/google/gerrit/server/restapi/account/CreateAccount.java @@ -21,9 +21,9 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; import com.google.gerrit.common.Nullable; import com.google.gerrit.common.data.GlobalCapability; -import com.google.gerrit.common.data.GroupDescription; import com.google.gerrit.entities.Account; import com.google.gerrit.entities.AccountGroup; +import com.google.gerrit.entities.GroupDescription; import com.google.gerrit.exceptions.InvalidSshKeyException; import com.google.gerrit.exceptions.NoSuchGroupException; import com.google.gerrit.extensions.annotations.RequiresCapability; diff --git a/java/com/google/gerrit/server/restapi/account/GetWatchedProjects.java b/java/com/google/gerrit/server/restapi/account/GetWatchedProjects.java index beb5e8fa94..8d65aacfa7 100644 --- a/java/com/google/gerrit/server/restapi/account/GetWatchedProjects.java +++ b/java/com/google/gerrit/server/restapi/account/GetWatchedProjects.java @@ -20,6 +20,7 @@ import static java.util.stream.Collectors.toList; import com.google.common.base.Strings; import com.google.common.collect.ImmutableSet; import com.google.gerrit.entities.Account; +import com.google.gerrit.entities.NotifyConfig.NotifyType; import com.google.gerrit.extensions.client.ProjectWatchInfo; import com.google.gerrit.extensions.restapi.AuthException; import com.google.gerrit.extensions.restapi.ResourceNotFoundException; @@ -29,7 +30,6 @@ import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.server.account.AccountResource; import com.google.gerrit.server.account.AccountState; import com.google.gerrit.server.account.Accounts; -import com.google.gerrit.server.account.ProjectWatches.NotifyType; import com.google.gerrit.server.account.ProjectWatches.ProjectWatchKey; import com.google.gerrit.server.permissions.GlobalPermission; import com.google.gerrit.server.permissions.PermissionBackend; diff --git a/java/com/google/gerrit/server/restapi/account/PostWatchedProjects.java b/java/com/google/gerrit/server/restapi/account/PostWatchedProjects.java index b2859e68d5..c80bf57fa3 100644 --- a/java/com/google/gerrit/server/restapi/account/PostWatchedProjects.java +++ b/java/com/google/gerrit/server/restapi/account/PostWatchedProjects.java @@ -14,6 +14,7 @@ package com.google.gerrit.server.restapi.account; +import com.google.gerrit.entities.NotifyConfig.NotifyType; import com.google.gerrit.extensions.client.ProjectWatchInfo; import com.google.gerrit.extensions.restapi.BadRequestException; import com.google.gerrit.extensions.restapi.Response; @@ -24,7 +25,6 @@ import com.google.gerrit.server.UserInitiated; import com.google.gerrit.server.account.AccountResource; import com.google.gerrit.server.account.AccountsUpdate; import com.google.gerrit.server.account.ProjectWatches; -import com.google.gerrit.server.account.ProjectWatches.NotifyType; import com.google.gerrit.server.account.ProjectWatches.ProjectWatchKey; import com.google.gerrit.server.permissions.GlobalPermission; import com.google.gerrit.server.permissions.PermissionBackend; diff --git a/java/com/google/gerrit/server/restapi/change/ReviewersUtil.java b/java/com/google/gerrit/server/restapi/change/ReviewersUtil.java index 676cc07c1f..2a55e41fb2 100644 --- a/java/com/google/gerrit/server/restapi/change/ReviewersUtil.java +++ b/java/com/google/gerrit/server/restapi/change/ReviewersUtil.java @@ -23,8 +23,8 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; import com.google.common.flogger.FluentLogger; import com.google.gerrit.common.Nullable; -import com.google.gerrit.common.data.GroupReference; import com.google.gerrit.entities.Account; +import com.google.gerrit.entities.GroupReference; import com.google.gerrit.entities.Project; import com.google.gerrit.exceptions.StorageException; import com.google.gerrit.extensions.client.ReviewerState; diff --git a/java/com/google/gerrit/server/restapi/config/AgreementJson.java b/java/com/google/gerrit/server/restapi/config/AgreementJson.java index d5c085b98a..e1e8e96b03 100644 --- a/java/com/google/gerrit/server/restapi/config/AgreementJson.java +++ b/java/com/google/gerrit/server/restapi/config/AgreementJson.java @@ -16,7 +16,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.common.data.GroupReference; +import com.google.gerrit.entities.GroupReference; import com.google.gerrit.exceptions.NoSuchGroupException; import com.google.gerrit.exceptions.StorageException; import com.google.gerrit.extensions.common.AgreementInfo; diff --git a/java/com/google/gerrit/server/restapi/group/AddMembers.java b/java/com/google/gerrit/server/restapi/group/AddMembers.java index 93d095d281..700a2ab32a 100644 --- a/java/com/google/gerrit/server/restapi/group/AddMembers.java +++ b/java/com/google/gerrit/server/restapi/group/AddMembers.java @@ -17,9 +17,9 @@ package com.google.gerrit.server.restapi.group; import com.google.common.base.Strings; import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import com.google.gerrit.common.data.GroupDescription; import com.google.gerrit.entities.Account; import com.google.gerrit.entities.AccountGroup; +import com.google.gerrit.entities.GroupDescription; import com.google.gerrit.exceptions.NoSuchGroupException; import com.google.gerrit.extensions.client.AuthType; import com.google.gerrit.extensions.common.AccountInfo; diff --git a/java/com/google/gerrit/server/restapi/group/AddSubgroups.java b/java/com/google/gerrit/server/restapi/group/AddSubgroups.java index 3fd3f2948c..23fa73dcf0 100644 --- a/java/com/google/gerrit/server/restapi/group/AddSubgroups.java +++ b/java/com/google/gerrit/server/restapi/group/AddSubgroups.java @@ -18,8 +18,8 @@ import com.google.common.base.Strings; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import com.google.gerrit.common.data.GroupDescription; import com.google.gerrit.entities.AccountGroup; +import com.google.gerrit.entities.GroupDescription; import com.google.gerrit.exceptions.NoSuchGroupException; import com.google.gerrit.extensions.common.GroupInfo; import com.google.gerrit.extensions.restapi.AuthException; diff --git a/java/com/google/gerrit/server/restapi/group/CreateGroup.java b/java/com/google/gerrit/server/restapi/group/CreateGroup.java index e5a1478b51..74ca721e25 100644 --- a/java/com/google/gerrit/server/restapi/group/CreateGroup.java +++ b/java/com/google/gerrit/server/restapi/group/CreateGroup.java @@ -18,9 +18,9 @@ import com.google.common.base.MoreObjects; import com.google.common.base.Strings; import com.google.common.collect.ImmutableSet; import com.google.gerrit.common.data.GlobalCapability; -import com.google.gerrit.common.data.GroupDescription; import com.google.gerrit.entities.Account; import com.google.gerrit.entities.AccountGroup; +import com.google.gerrit.entities.GroupDescription; import com.google.gerrit.exceptions.DuplicateKeyException; import com.google.gerrit.extensions.annotations.RequiresCapability; import com.google.gerrit.extensions.api.groups.GroupInput; diff --git a/java/com/google/gerrit/server/restapi/group/DeleteMembers.java b/java/com/google/gerrit/server/restapi/group/DeleteMembers.java index a7b2e2dc89..fa52a791ad 100644 --- a/java/com/google/gerrit/server/restapi/group/DeleteMembers.java +++ b/java/com/google/gerrit/server/restapi/group/DeleteMembers.java @@ -16,9 +16,9 @@ package com.google.gerrit.server.restapi.group; import com.google.common.base.Strings; import com.google.common.collect.Sets; -import com.google.gerrit.common.data.GroupDescription; import com.google.gerrit.entities.Account; import com.google.gerrit.entities.AccountGroup; +import com.google.gerrit.entities.GroupDescription; import com.google.gerrit.exceptions.NoSuchGroupException; import com.google.gerrit.extensions.restapi.AuthException; import com.google.gerrit.extensions.restapi.MethodNotAllowedException; diff --git a/java/com/google/gerrit/server/restapi/group/DeleteSubgroups.java b/java/com/google/gerrit/server/restapi/group/DeleteSubgroups.java index b9d6ca80a9..fe676352c7 100644 --- a/java/com/google/gerrit/server/restapi/group/DeleteSubgroups.java +++ b/java/com/google/gerrit/server/restapi/group/DeleteSubgroups.java @@ -16,8 +16,8 @@ package com.google.gerrit.server.restapi.group; import com.google.common.collect.ImmutableList; import com.google.common.collect.Sets; -import com.google.gerrit.common.data.GroupDescription; import com.google.gerrit.entities.AccountGroup; +import com.google.gerrit.entities.GroupDescription; import com.google.gerrit.exceptions.NoSuchGroupException; import com.google.gerrit.extensions.restapi.AuthException; import com.google.gerrit.extensions.restapi.MethodNotAllowedException; diff --git a/java/com/google/gerrit/server/restapi/group/GetAuditLog.java b/java/com/google/gerrit/server/restapi/group/GetAuditLog.java index 508547d45e..8a469f1df9 100644 --- a/java/com/google/gerrit/server/restapi/group/GetAuditLog.java +++ b/java/com/google/gerrit/server/restapi/group/GetAuditLog.java @@ -16,10 +16,10 @@ package com.google.gerrit.server.restapi.group; import static java.util.Comparator.comparing; -import com.google.gerrit.common.data.GroupDescription; import com.google.gerrit.entities.AccountGroup; import com.google.gerrit.entities.AccountGroupByIdAudit; import com.google.gerrit.entities.AccountGroupMemberAudit; +import com.google.gerrit.entities.GroupDescription; import com.google.gerrit.extensions.common.AccountInfo; import com.google.gerrit.extensions.common.GroupAuditEventInfo; import com.google.gerrit.extensions.common.GroupInfo; diff --git a/java/com/google/gerrit/server/restapi/group/GetDescription.java b/java/com/google/gerrit/server/restapi/group/GetDescription.java index b77028118d..f65b5e0896 100644 --- a/java/com/google/gerrit/server/restapi/group/GetDescription.java +++ b/java/com/google/gerrit/server/restapi/group/GetDescription.java @@ -15,7 +15,7 @@ package com.google.gerrit.server.restapi.group; import com.google.common.base.Strings; -import com.google.gerrit.common.data.GroupDescription; +import com.google.gerrit.entities.GroupDescription; import com.google.gerrit.extensions.restapi.Response; import com.google.gerrit.extensions.restapi.RestReadView; import com.google.gerrit.server.group.GroupResource; diff --git a/java/com/google/gerrit/server/restapi/group/GetOwner.java b/java/com/google/gerrit/server/restapi/group/GetOwner.java index e8bdfaae2b..2ab9a69c0f 100644 --- a/java/com/google/gerrit/server/restapi/group/GetOwner.java +++ b/java/com/google/gerrit/server/restapi/group/GetOwner.java @@ -14,7 +14,7 @@ package com.google.gerrit.server.restapi.group; -import com.google.gerrit.common.data.GroupDescription; +import com.google.gerrit.entities.GroupDescription; import com.google.gerrit.exceptions.NoSuchGroupException; import com.google.gerrit.extensions.common.GroupInfo; import com.google.gerrit.extensions.restapi.ResourceNotFoundException; diff --git a/java/com/google/gerrit/server/restapi/group/GroupJson.java b/java/com/google/gerrit/server/restapi/group/GroupJson.java index 99c9df7152..e1459c36b0 100644 --- a/java/com/google/gerrit/server/restapi/group/GroupJson.java +++ b/java/com/google/gerrit/server/restapi/group/GroupJson.java @@ -19,8 +19,8 @@ import static com.google.gerrit.extensions.client.ListGroupsOption.MEMBERS; import com.google.common.base.Strings; import com.google.common.base.Suppliers; -import com.google.gerrit.common.data.GroupDescription; import com.google.gerrit.entities.AccountGroup; +import com.google.gerrit.entities.GroupDescription; import com.google.gerrit.extensions.client.ListGroupsOption; import com.google.gerrit.extensions.common.GroupInfo; import com.google.gerrit.extensions.common.GroupOptionsInfo; diff --git a/java/com/google/gerrit/server/restapi/group/GroupsCollection.java b/java/com/google/gerrit/server/restapi/group/GroupsCollection.java index 65a7f4f9df..e0cfb1e5ca 100644 --- a/java/com/google/gerrit/server/restapi/group/GroupsCollection.java +++ b/java/com/google/gerrit/server/restapi/group/GroupsCollection.java @@ -15,7 +15,7 @@ package com.google.gerrit.server.restapi.group; import com.google.common.collect.ListMultimap; -import com.google.gerrit.common.data.GroupDescription; +import com.google.gerrit.entities.GroupDescription; import com.google.gerrit.extensions.registration.DynamicMap; import com.google.gerrit.extensions.restapi.AuthException; import com.google.gerrit.extensions.restapi.BadRequestException; diff --git a/java/com/google/gerrit/server/restapi/group/ListGroups.java b/java/com/google/gerrit/server/restapi/group/ListGroups.java index bcb199f215..3e2a577eae 100644 --- a/java/com/google/gerrit/server/restapi/group/ListGroups.java +++ b/java/com/google/gerrit/server/restapi/group/ListGroups.java @@ -21,10 +21,10 @@ import com.google.common.base.MoreObjects; import com.google.common.base.Strings; import com.google.common.collect.Lists; import com.google.common.collect.Streams; -import com.google.gerrit.common.data.GroupDescription; -import com.google.gerrit.common.data.GroupReference; import com.google.gerrit.entities.Account; import com.google.gerrit.entities.AccountGroup; +import com.google.gerrit.entities.GroupDescription; +import com.google.gerrit.entities.GroupReference; import com.google.gerrit.exceptions.NoSuchGroupException; import com.google.gerrit.extensions.client.ListGroupsOption; import com.google.gerrit.extensions.client.ListOption; diff --git a/java/com/google/gerrit/server/restapi/group/ListMembers.java b/java/com/google/gerrit/server/restapi/group/ListMembers.java index 23f0aa7ace..5b3e8dc42c 100644 --- a/java/com/google/gerrit/server/restapi/group/ListMembers.java +++ b/java/com/google/gerrit/server/restapi/group/ListMembers.java @@ -20,9 +20,9 @@ import static com.google.common.collect.ImmutableSet.toImmutableSet; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; -import com.google.gerrit.common.data.GroupDescription; import com.google.gerrit.entities.Account; import com.google.gerrit.entities.AccountGroup; +import com.google.gerrit.entities.GroupDescription; import com.google.gerrit.extensions.common.AccountInfo; import com.google.gerrit.extensions.restapi.Response; import com.google.gerrit.extensions.restapi.RestReadView; diff --git a/java/com/google/gerrit/server/restapi/group/ListSubgroups.java b/java/com/google/gerrit/server/restapi/group/ListSubgroups.java index 540718ff7b..776c17c70a 100644 --- a/java/com/google/gerrit/server/restapi/group/ListSubgroups.java +++ b/java/com/google/gerrit/server/restapi/group/ListSubgroups.java @@ -18,8 +18,8 @@ import static com.google.common.base.Strings.nullToEmpty; import static java.util.Comparator.comparing; import com.google.common.flogger.FluentLogger; -import com.google.gerrit.common.data.GroupDescription; import com.google.gerrit.entities.AccountGroup; +import com.google.gerrit.entities.GroupDescription; import com.google.gerrit.exceptions.NoSuchGroupException; import com.google.gerrit.extensions.common.GroupInfo; import com.google.gerrit.extensions.restapi.Response; diff --git a/java/com/google/gerrit/server/restapi/group/MembersCollection.java b/java/com/google/gerrit/server/restapi/group/MembersCollection.java index 6dfb2b6ec3..79f3d6a610 100644 --- a/java/com/google/gerrit/server/restapi/group/MembersCollection.java +++ b/java/com/google/gerrit/server/restapi/group/MembersCollection.java @@ -14,7 +14,7 @@ package com.google.gerrit.server.restapi.group; -import com.google.gerrit.common.data.GroupDescription; +import com.google.gerrit.entities.GroupDescription; 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/group/PutDescription.java b/java/com/google/gerrit/server/restapi/group/PutDescription.java index 8fe4b20585..942e680776 100644 --- a/java/com/google/gerrit/server/restapi/group/PutDescription.java +++ b/java/com/google/gerrit/server/restapi/group/PutDescription.java @@ -15,8 +15,8 @@ package com.google.gerrit.server.restapi.group; import com.google.common.base.Strings; -import com.google.gerrit.common.data.GroupDescription; import com.google.gerrit.entities.AccountGroup; +import com.google.gerrit.entities.GroupDescription; import com.google.gerrit.exceptions.NoSuchGroupException; import com.google.gerrit.extensions.common.DescriptionInput; import com.google.gerrit.extensions.restapi.AuthException; diff --git a/java/com/google/gerrit/server/restapi/group/PutName.java b/java/com/google/gerrit/server/restapi/group/PutName.java index 9a3c87d5d7..acdae332c4 100644 --- a/java/com/google/gerrit/server/restapi/group/PutName.java +++ b/java/com/google/gerrit/server/restapi/group/PutName.java @@ -15,8 +15,8 @@ package com.google.gerrit.server.restapi.group; import com.google.common.base.Strings; -import com.google.gerrit.common.data.GroupDescription; import com.google.gerrit.entities.AccountGroup; +import com.google.gerrit.entities.GroupDescription; import com.google.gerrit.exceptions.DuplicateKeyException; import com.google.gerrit.exceptions.NoSuchGroupException; import com.google.gerrit.extensions.common.NameInput; diff --git a/java/com/google/gerrit/server/restapi/group/PutOptions.java b/java/com/google/gerrit/server/restapi/group/PutOptions.java index 53bf5715d8..748861e2c0 100644 --- a/java/com/google/gerrit/server/restapi/group/PutOptions.java +++ b/java/com/google/gerrit/server/restapi/group/PutOptions.java @@ -14,8 +14,8 @@ package com.google.gerrit.server.restapi.group; -import com.google.gerrit.common.data.GroupDescription; import com.google.gerrit.entities.AccountGroup; +import com.google.gerrit.entities.GroupDescription; import com.google.gerrit.exceptions.NoSuchGroupException; import com.google.gerrit.extensions.common.GroupOptionsInfo; import com.google.gerrit.extensions.restapi.AuthException; diff --git a/java/com/google/gerrit/server/restapi/group/PutOwner.java b/java/com/google/gerrit/server/restapi/group/PutOwner.java index 04129af65f..96ce9e4030 100644 --- a/java/com/google/gerrit/server/restapi/group/PutOwner.java +++ b/java/com/google/gerrit/server/restapi/group/PutOwner.java @@ -15,8 +15,8 @@ package com.google.gerrit.server.restapi.group; import com.google.common.base.Strings; -import com.google.gerrit.common.data.GroupDescription; import com.google.gerrit.entities.AccountGroup; +import com.google.gerrit.entities.GroupDescription; import com.google.gerrit.exceptions.NoSuchGroupException; import com.google.gerrit.extensions.api.groups.OwnerInput; import com.google.gerrit.extensions.common.GroupInfo; diff --git a/java/com/google/gerrit/server/restapi/group/SubgroupsCollection.java b/java/com/google/gerrit/server/restapi/group/SubgroupsCollection.java index cebc27a407..c7f6473815 100644 --- a/java/com/google/gerrit/server/restapi/group/SubgroupsCollection.java +++ b/java/com/google/gerrit/server/restapi/group/SubgroupsCollection.java @@ -14,7 +14,7 @@ package com.google.gerrit.server.restapi.group; -import com.google.gerrit.common.data.GroupDescription; +import com.google.gerrit.entities.GroupDescription; 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/GetAccess.java b/java/com/google/gerrit/server/restapi/project/GetAccess.java index 2d1191ff6a..f60601ebce 100644 --- a/java/com/google/gerrit/server/restapi/project/GetAccess.java +++ b/java/com/google/gerrit/server/restapi/project/GetAccess.java @@ -27,10 +27,10 @@ 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.GroupDescription; import com.google.gerrit.common.data.Permission; import com.google.gerrit.common.data.PermissionRule; import com.google.gerrit.entities.AccountGroup; +import com.google.gerrit.entities.GroupDescription; 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/ListProjects.java b/java/com/google/gerrit/server/restapi/project/ListProjects.java index c56e8c6d08..0c16822294 100644 --- a/java/com/google/gerrit/server/restapi/project/ListProjects.java +++ b/java/com/google/gerrit/server/restapi/project/ListProjects.java @@ -26,8 +26,8 @@ import com.google.common.collect.ImmutableSortedMap; import com.google.common.collect.Iterables; import com.google.common.flogger.FluentLogger; import com.google.gerrit.common.Nullable; -import com.google.gerrit.common.data.GroupReference; import com.google.gerrit.entities.AccountGroup; +import com.google.gerrit.entities.GroupReference; import com.google.gerrit.entities.Project; import com.google.gerrit.entities.RefNames; import com.google.gerrit.exceptions.NoSuchGroupException; diff --git a/java/com/google/gerrit/server/restapi/project/SetAccessUtil.java b/java/com/google/gerrit/server/restapi/project/SetAccessUtil.java index d1511c1351..572b798ccc 100644 --- a/java/com/google/gerrit/server/restapi/project/SetAccessUtil.java +++ b/java/com/google/gerrit/server/restapi/project/SetAccessUtil.java @@ -17,11 +17,11 @@ 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.GroupDescription; -import com.google.gerrit.common.data.GroupReference; 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.GroupDescription; +import com.google.gerrit.entities.GroupReference; 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/schema/AclUtil.java b/java/com/google/gerrit/server/schema/AclUtil.java index e65568f90c..6db9339772 100644 --- a/java/com/google/gerrit/server/schema/AclUtil.java +++ b/java/com/google/gerrit/server/schema/AclUtil.java @@ -15,10 +15,10 @@ package com.google.gerrit.server.schema; import com.google.gerrit.common.data.AccessSection; -import com.google.gerrit.common.data.GroupReference; 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.GroupReference; 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 0fb282e7e6..cd3c94551c 100644 --- a/java/com/google/gerrit/server/schema/AllProjectsCreator.java +++ b/java/com/google/gerrit/server/schema/AllProjectsCreator.java @@ -25,10 +25,10 @@ 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.GroupReference; 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.GroupReference; 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 c91695f238..208e520f26 100644 --- a/java/com/google/gerrit/server/schema/AllProjectsInput.java +++ b/java/com/google/gerrit/server/schema/AllProjectsInput.java @@ -18,10 +18,10 @@ 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.GroupReference; import com.google.gerrit.common.data.LabelType; import com.google.gerrit.common.data.LabelValue; import com.google.gerrit.entities.BooleanProjectConfig; +import com.google.gerrit.entities.GroupReference; import com.google.gerrit.extensions.client.InheritableBoolean; import com.google.gerrit.server.notedb.Sequences; import java.util.Optional; diff --git a/java/com/google/gerrit/server/schema/AllUsersCreator.java b/java/com/google/gerrit/server/schema/AllUsersCreator.java index 1ac8e6987f..89fd3654d7 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.GroupReference; 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.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 d4ba29b50c..77513d3305 100644 --- a/java/com/google/gerrit/server/schema/GrantRevertPermission.java +++ b/java/com/google/gerrit/server/schema/GrantRevertPermission.java @@ -19,8 +19,8 @@ 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.GroupReference; import com.google.gerrit.common.data.Permission; +import com.google.gerrit.entities.GroupReference; 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/SchemaCreatorImpl.java b/java/com/google/gerrit/server/schema/SchemaCreatorImpl.java index 1279218b00..f53f9a6168 100644 --- a/java/com/google/gerrit/server/schema/SchemaCreatorImpl.java +++ b/java/com/google/gerrit/server/schema/SchemaCreatorImpl.java @@ -16,8 +16,8 @@ package com.google.gerrit.server.schema; import com.google.common.collect.ImmutableSet; import com.google.gerrit.common.Nullable; -import com.google.gerrit.common.data.GroupReference; import com.google.gerrit.entities.AccountGroup; +import com.google.gerrit.entities.GroupReference; import com.google.gerrit.exceptions.DuplicateKeyException; import com.google.gerrit.git.RefUpdateUtil; import com.google.gerrit.metrics.MetricMaker; diff --git a/javatests/com/google/gerrit/acceptance/api/accounts/AccountIT.java b/javatests/com/google/gerrit/acceptance/api/accounts/AccountIT.java index 3596440879..60c2543c68 100644 --- a/javatests/com/google/gerrit/acceptance/api/accounts/AccountIT.java +++ b/javatests/com/google/gerrit/acceptance/api/accounts/AccountIT.java @@ -78,7 +78,6 @@ 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.GroupReference; import com.google.gerrit.common.data.Permission; import com.google.gerrit.common.data.PermissionRule.Action; import com.google.gerrit.entities.Account; @@ -86,6 +85,7 @@ 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.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 62a1ad28a4..c4bb47ab41 100644 --- a/javatests/com/google/gerrit/acceptance/api/accounts/AgreementsIT.java +++ b/javatests/com/google/gerrit/acceptance/api/accounts/AgreementsIT.java @@ -29,10 +29,10 @@ 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.GroupReference; import com.google.gerrit.common.data.PermissionRule; import com.google.gerrit.entities.AccountGroup; import com.google.gerrit.entities.BooleanProjectConfig; +import com.google.gerrit.entities.GroupReference; 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/group/GroupsIT.java b/javatests/com/google/gerrit/acceptance/api/group/GroupsIT.java index 8bc9cd1fa8..acebe67f6b 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.GroupReference; 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.Project; import com.google.gerrit.entities.RefNames; import com.google.gerrit.extensions.api.changes.ReviewInput; diff --git a/javatests/com/google/gerrit/acceptance/api/group/GroupsUpdateIT.java b/javatests/com/google/gerrit/acceptance/api/group/GroupsUpdateIT.java index 6fcca8c68c..c977d439cc 100644 --- a/javatests/com/google/gerrit/acceptance/api/group/GroupsUpdateIT.java +++ b/javatests/com/google/gerrit/acceptance/api/group/GroupsUpdateIT.java @@ -18,9 +18,9 @@ import static com.google.common.truth.Truth8.assertThat; import static com.google.gerrit.testing.GerritJUnit.assertThrows; import com.google.common.collect.ImmutableSet; -import com.google.gerrit.common.data.GroupReference; import com.google.gerrit.entities.Account; import com.google.gerrit.entities.AccountGroup; +import com.google.gerrit.entities.GroupReference; import com.google.gerrit.exceptions.NoSuchGroupException; import com.google.gerrit.exceptions.StorageException; import com.google.gerrit.server.ServerInitiated; diff --git a/javatests/com/google/gerrit/acceptance/git/PushAccountIT.java b/javatests/com/google/gerrit/acceptance/git/PushAccountIT.java index 6f7a4c3ce7..86fce9c190 100644 --- a/javatests/com/google/gerrit/acceptance/git/PushAccountIT.java +++ b/javatests/com/google/gerrit/acceptance/git/PushAccountIT.java @@ -35,6 +35,7 @@ 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.RefNames; import com.google.gerrit.extensions.api.changes.ReviewInput; import com.google.gerrit.extensions.common.AccountInfo; @@ -43,7 +44,6 @@ import com.google.gerrit.server.ServerInitiated; import com.google.gerrit.server.account.AccountProperties; import com.google.gerrit.server.account.AccountsUpdate; import com.google.gerrit.server.account.ProjectWatches; -import com.google.gerrit.server.account.ProjectWatches.NotifyType; import com.google.gerrit.server.notedb.Sequences; import com.google.gerrit.server.util.MagicBranch; import com.google.gerrit.testing.ConfigSuite; diff --git a/javatests/com/google/gerrit/acceptance/rest/project/AccessIT.java b/javatests/com/google/gerrit/acceptance/rest/project/AccessIT.java index 46054ecb37..5f17e8787b 100644 --- a/javatests/com/google/gerrit/acceptance/rest/project/AccessIT.java +++ b/javatests/com/google/gerrit/acceptance/rest/project/AccessIT.java @@ -33,8 +33,8 @@ 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.GroupReference; import com.google.gerrit.common.data.Permission; +import com.google.gerrit.entities.GroupReference; 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/server/mail/ChangeNotificationsIT.java b/javatests/com/google/gerrit/acceptance/server/mail/ChangeNotificationsIT.java index 76514ecc38..70d8335684 100644 --- a/javatests/com/google/gerrit/acceptance/server/mail/ChangeNotificationsIT.java +++ b/javatests/com/google/gerrit/acceptance/server/mail/ChangeNotificationsIT.java @@ -17,17 +17,17 @@ package com.google.gerrit.acceptance.server.mail; import static com.google.common.truth.Truth.assertWithMessage; 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.entities.NotifyConfig.NotifyType.ABANDONED_CHANGES; +import static com.google.gerrit.entities.NotifyConfig.NotifyType.ALL_COMMENTS; +import static com.google.gerrit.entities.NotifyConfig.NotifyType.NEW_CHANGES; +import static com.google.gerrit.entities.NotifyConfig.NotifyType.NEW_PATCHSETS; +import static com.google.gerrit.entities.NotifyConfig.NotifyType.SUBMITTED_CHANGES; import static com.google.gerrit.extensions.api.changes.NotifyHandling.ALL; import static com.google.gerrit.extensions.api.changes.NotifyHandling.NONE; import static com.google.gerrit.extensions.api.changes.NotifyHandling.OWNER; import static com.google.gerrit.extensions.api.changes.NotifyHandling.OWNER_REVIEWERS; import static com.google.gerrit.extensions.client.GeneralPreferencesInfo.EmailStrategy.CC_ON_OWN_COMMENTS; import static com.google.gerrit.extensions.client.GeneralPreferencesInfo.EmailStrategy.ENABLED; -import static com.google.gerrit.server.account.ProjectWatches.NotifyType.ABANDONED_CHANGES; -import static com.google.gerrit.server.account.ProjectWatches.NotifyType.ALL_COMMENTS; -import static com.google.gerrit.server.account.ProjectWatches.NotifyType.NEW_CHANGES; -import static com.google.gerrit.server.account.ProjectWatches.NotifyType.NEW_PATCHSETS; -import static com.google.gerrit.server.account.ProjectWatches.NotifyType.SUBMITTED_CHANGES; import static com.google.gerrit.server.group.SystemGroupBackend.REGISTERED_USERS; import com.google.common.collect.ImmutableList; diff --git a/javatests/com/google/gerrit/acceptance/server/project/ProjectWatchIT.java b/javatests/com/google/gerrit/acceptance/server/project/ProjectWatchIT.java index 5eff044aaa..b04ae33b57 100644 --- a/javatests/com/google/gerrit/acceptance/server/project/ProjectWatchIT.java +++ b/javatests/com/google/gerrit/acceptance/server/project/ProjectWatchIT.java @@ -28,12 +28,12 @@ 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.Project; import com.google.gerrit.extensions.api.changes.ReviewInput; import com.google.gerrit.extensions.api.changes.StarsInput; import com.google.gerrit.extensions.common.GroupInfo; -import com.google.gerrit.server.account.ProjectWatches.NotifyType; -import com.google.gerrit.server.git.NotifyConfig; import com.google.gerrit.testing.FakeEmailSender.Message; import com.google.inject.Inject; import java.util.EnumSet; diff --git a/javatests/com/google/gerrit/common/data/GroupReferenceTest.java b/javatests/com/google/gerrit/common/data/GroupReferenceTest.java index 113bd77165..593b635b50 100644 --- a/javatests/com/google/gerrit/common/data/GroupReferenceTest.java +++ b/javatests/com/google/gerrit/common/data/GroupReferenceTest.java @@ -19,6 +19,8 @@ import static com.google.gerrit.testing.GerritJUnit.assertThrows; import com.google.gerrit.entities.AccountGroup; import com.google.gerrit.entities.AccountGroup.UUID; +import com.google.gerrit.entities.GroupDescription; +import com.google.gerrit.entities.GroupReference; import org.junit.Test; public class GroupReferenceTest { diff --git a/javatests/com/google/gerrit/common/data/PermissionRuleTest.java b/javatests/com/google/gerrit/common/data/PermissionRuleTest.java index d193b098cb..ee6590ad6d 100644 --- a/javatests/com/google/gerrit/common/data/PermissionRuleTest.java +++ b/javatests/com/google/gerrit/common/data/PermissionRuleTest.java @@ -18,6 +18,7 @@ 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 org.junit.Before; import org.junit.Test; diff --git a/javatests/com/google/gerrit/common/data/PermissionTest.java b/javatests/com/google/gerrit/common/data/PermissionTest.java index 9dd71cab10..ac3e2c5e16 100644 --- a/javatests/com/google/gerrit/common/data/PermissionTest.java +++ b/javatests/com/google/gerrit/common/data/PermissionTest.java @@ -17,6 +17,7 @@ package com.google.gerrit.common.data; 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/server/account/AccountCacheTest.java b/javatests/com/google/gerrit/server/account/AccountCacheTest.java index 5e75fe5ede..a2aa40babf 100644 --- a/javatests/com/google/gerrit/server/account/AccountCacheTest.java +++ b/javatests/com/google/gerrit/server/account/AccountCacheTest.java @@ -19,6 +19,7 @@ import com.google.common.collect.ImmutableSet; import com.google.common.truth.Truth; import com.google.common.truth.extensions.proto.ProtoTruth; import com.google.gerrit.entities.Account; +import com.google.gerrit.entities.NotifyConfig; import com.google.gerrit.entities.Project; import com.google.gerrit.server.cache.proto.Cache; import com.google.gerrit.server.config.CachedPreferences; @@ -103,7 +104,7 @@ public class AccountCacheTest { CachedAccountDetails original = CachedAccountDetails.create( ACCOUNT, - ImmutableMap.of(key, ImmutableSet.of(ProjectWatches.NotifyType.ALL_COMMENTS)), + ImmutableMap.of(key, ImmutableSet.of(NotifyConfig.NotifyType.ALL_COMMENTS)), CachedPreferences.fromString("")); byte[] serialized = SERIALIZER.serialize(original); @@ -127,7 +128,7 @@ public class AccountCacheTest { CachedAccountDetails original = CachedAccountDetails.create( ACCOUNT, - ImmutableMap.of(key, ImmutableSet.of(ProjectWatches.NotifyType.ALL_COMMENTS)), + ImmutableMap.of(key, ImmutableSet.of(NotifyConfig.NotifyType.ALL_COMMENTS)), CachedPreferences.fromString("")); byte[] serialized = SERIALIZER.serialize(original); diff --git a/javatests/com/google/gerrit/server/account/WatchConfigTest.java b/javatests/com/google/gerrit/server/account/WatchConfigTest.java index 95dbbde2f3..7d36b94b08 100644 --- a/javatests/com/google/gerrit/server/account/WatchConfigTest.java +++ b/javatests/com/google/gerrit/server/account/WatchConfigTest.java @@ -19,8 +19,8 @@ import static com.google.common.truth.Truth.assertWithMessage; import com.google.common.collect.ImmutableSet; import com.google.gerrit.entities.Account; +import com.google.gerrit.entities.NotifyConfig.NotifyType; import com.google.gerrit.entities.Project; -import com.google.gerrit.server.account.ProjectWatches.NotifyType; import com.google.gerrit.server.account.ProjectWatches.NotifyValue; import com.google.gerrit.server.account.ProjectWatches.ProjectWatchKey; import com.google.gerrit.server.git.ValidationError; 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 088232284f..81372d5543 100644 --- a/javatests/com/google/gerrit/server/cache/serialize/entities/ContributorAgreementSerializerTest.java +++ b/javatests/com/google/gerrit/server/cache/serialize/entities/ContributorAgreementSerializerTest.java @@ -20,8 +20,8 @@ import static com.google.gerrit.server.cache.serialize.entities.ContributorAgree import com.google.common.collect.ImmutableList; import com.google.gerrit.common.data.ContributorAgreement; -import com.google.gerrit.common.data.GroupReference; import com.google.gerrit.common.data.PermissionRule; +import com.google.gerrit.entities.GroupReference; 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 b52f4ea114..a5092e0b86 100644 --- a/javatests/com/google/gerrit/server/cache/serialize/entities/GroupReferenceSerializerTest.java +++ b/javatests/com/google/gerrit/server/cache/serialize/entities/GroupReferenceSerializerTest.java @@ -18,8 +18,8 @@ import static com.google.common.truth.Truth.assertThat; import static com.google.gerrit.server.cache.serialize.entities.GroupReferenceSerializer.deserialize; import static com.google.gerrit.server.cache.serialize.entities.GroupReferenceSerializer.serialize; -import com.google.gerrit.common.data.GroupReference; import com.google.gerrit.entities.AccountGroup; +import com.google.gerrit.entities.GroupReference; import org.junit.Test; public class GroupReferenceSerializerTest { diff --git a/javatests/com/google/gerrit/server/cache/serialize/entities/NotifyConfigSerializerTest.java b/javatests/com/google/gerrit/server/cache/serialize/entities/NotifyConfigSerializerTest.java new file mode 100644 index 0000000000..3447ae37ab --- /dev/null +++ b/javatests/com/google/gerrit/server/cache/serialize/entities/NotifyConfigSerializerTest.java @@ -0,0 +1,47 @@ +// 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.NotifyConfigSerializer.deserialize; +import static com.google.gerrit.server.cache.serialize.entities.NotifyConfigSerializer.serialize; + +import com.google.common.collect.ImmutableSet; +import com.google.gerrit.entities.Address; +import com.google.gerrit.entities.GroupReference; +import com.google.gerrit.entities.NotifyConfig; +import org.junit.Test; + +public class NotifyConfigSerializerTest { + @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); + } + + @Test + public void roundTripWithMinimalValues() { + NotifyConfig autoValue = NotifyConfig.builder().setName("foo-bar").build(); + assertThat(deserialize(serialize(autoValue))).isEqualTo(autoValue); + } +} 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 b447d5e10e..3ce3549ccc 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.GroupReference; import com.google.gerrit.common.data.PermissionRule; +import com.google.gerrit.entities.GroupReference; 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 9b7f3d9bd2..ae399eb1d1 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.GroupReference; import com.google.gerrit.common.data.Permission; import com.google.gerrit.common.data.PermissionRule; +import com.google.gerrit.entities.GroupReference; import org.junit.Test; public class PermissionSerializerTest { diff --git a/javatests/com/google/gerrit/server/group/db/AbstractGroupTest.java b/javatests/com/google/gerrit/server/group/db/AbstractGroupTest.java index c749b77549..20fe387a0f 100644 --- a/javatests/com/google/gerrit/server/group/db/AbstractGroupTest.java +++ b/javatests/com/google/gerrit/server/group/db/AbstractGroupTest.java @@ -17,9 +17,9 @@ package com.google.gerrit.server.group.db; import static com.google.gerrit.extensions.common.testing.CommitInfoSubject.assertThat; import com.google.gerrit.common.Nullable; -import com.google.gerrit.common.data.GroupDescription; import com.google.gerrit.entities.Account; import com.google.gerrit.entities.AccountGroup; +import com.google.gerrit.entities.GroupDescription; import com.google.gerrit.entities.RefNames; import com.google.gerrit.extensions.common.CommitInfo; import com.google.gerrit.server.config.AllUsersName; diff --git a/javatests/com/google/gerrit/server/group/db/GroupConfigTest.java b/javatests/com/google/gerrit/server/group/db/GroupConfigTest.java index b7fe23d339..c1f3615f56 100644 --- a/javatests/com/google/gerrit/server/group/db/GroupConfigTest.java +++ b/javatests/com/google/gerrit/server/group/db/GroupConfigTest.java @@ -25,9 +25,9 @@ import static org.hamcrest.MatcherAssert.assertThat; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; import com.google.gerrit.common.Nullable; -import com.google.gerrit.common.data.GroupDescription; import com.google.gerrit.entities.Account; import com.google.gerrit.entities.AccountGroup; +import com.google.gerrit.entities.GroupDescription; import com.google.gerrit.entities.Project; import com.google.gerrit.entities.RefNames; import com.google.gerrit.server.extensions.events.GitReferenceUpdated; diff --git a/javatests/com/google/gerrit/server/group/db/GroupNameNotesTest.java b/javatests/com/google/gerrit/server/group/db/GroupNameNotesTest.java index 278f6179e4..3b7beb9112 100644 --- a/javatests/com/google/gerrit/server/group/db/GroupNameNotesTest.java +++ b/javatests/com/google/gerrit/server/group/db/GroupNameNotesTest.java @@ -25,9 +25,9 @@ import static java.nio.charset.StandardCharsets.UTF_8; import static org.eclipse.jgit.lib.Constants.OBJ_BLOB; import com.google.common.collect.ImmutableList; -import com.google.gerrit.common.data.GroupReference; import com.google.gerrit.common.data.testing.GroupReferenceSubject; import com.google.gerrit.entities.AccountGroup; +import com.google.gerrit.entities.GroupReference; import com.google.gerrit.entities.Project; import com.google.gerrit.entities.RefNames; import com.google.gerrit.exceptions.DuplicateKeyException; diff --git a/javatests/com/google/gerrit/server/project/CommitsCollectionTest.java b/javatests/com/google/gerrit/server/project/CommitsCollectionTest.java index 5e5755138f..5af8a1eb63 100644 --- a/javatests/com/google/gerrit/server/project/CommitsCollectionTest.java +++ b/javatests/com/google/gerrit/server/project/CommitsCollectionTest.java @@ -28,11 +28,11 @@ 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.GroupReference; 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.GroupReference; 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/GroupListTest.java b/javatests/com/google/gerrit/server/project/GroupListTest.java index 18e1631418..f3295f83fd 100644 --- a/javatests/com/google/gerrit/server/project/GroupListTest.java +++ b/javatests/com/google/gerrit/server/project/GroupListTest.java @@ -23,8 +23,8 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -import com.google.gerrit.common.data.GroupReference; import com.google.gerrit.entities.AccountGroup; +import com.google.gerrit.entities.GroupReference; import com.google.gerrit.entities.Project; import com.google.gerrit.server.git.ValidationError; import java.io.IOException; diff --git a/javatests/com/google/gerrit/server/project/ProjectConfigTest.java b/javatests/com/google/gerrit/server/project/ProjectConfigTest.java index 3aa2726b36..a7c1435a2d 100644 --- a/javatests/com/google/gerrit/server/project/ProjectConfigTest.java +++ b/javatests/com/google/gerrit/server/project/ProjectConfigTest.java @@ -22,12 +22,12 @@ 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.GroupReference; 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.AccountGroup; import com.google.gerrit.entities.BranchOrderSection; +import com.google.gerrit.entities.GroupReference; import com.google.gerrit.entities.Project; import com.google.gerrit.entities.RefNames; import com.google.gerrit.extensions.client.InheritableBoolean; diff --git a/javatests/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java b/javatests/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java index 2eb25da36c..a013145118 100644 --- a/javatests/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java +++ b/javatests/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java @@ -44,7 +44,6 @@ 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.GroupReference; import com.google.gerrit.common.data.LabelType; import com.google.gerrit.common.data.Permission; import com.google.gerrit.common.data.PermissionRule; @@ -52,6 +51,7 @@ 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.Patch; import com.google.gerrit.entities.PatchSet; import com.google.gerrit.entities.Project; diff --git a/javatests/com/google/gerrit/server/schema/AllProjectsCreatorTest.java b/javatests/com/google/gerrit/server/schema/AllProjectsCreatorTest.java index 9cf489629e..97789a9cc0 100644 --- a/javatests/com/google/gerrit/server/schema/AllProjectsCreatorTest.java +++ b/javatests/com/google/gerrit/server/schema/AllProjectsCreatorTest.java @@ -23,11 +23,11 @@ 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.GroupReference; import com.google.gerrit.common.data.LabelType; import com.google.gerrit.common.data.LabelValue; import com.google.gerrit.entities.AccountGroup; import com.google.gerrit.entities.BooleanProjectConfig; +import com.google.gerrit.entities.GroupReference; import com.google.gerrit.extensions.client.InheritableBoolean; import com.google.gerrit.server.GerritPersonIdent; import com.google.gerrit.server.account.GroupUuid; diff --git a/plugins/replication b/plugins/replication index 209eba756f..9d4d19a579 160000 --- a/plugins/replication +++ b/plugins/replication @@ -1 +1 @@ -Subproject commit 209eba756f281418d917173fcc6b6c75cd12462a +Subproject commit 9d4d19a579fc4962ab7f85f6b5cb12501ed048ad diff --git a/plugins/singleusergroup b/plugins/singleusergroup index 9eb63345a1..58ee52a867 160000 --- a/plugins/singleusergroup +++ b/plugins/singleusergroup @@ -1 +1 @@ -Subproject commit 9eb63345a129533aa88235af3ba9308c53cee1d2 +Subproject commit 58ee52a8670e38f30785bfbb648ba27c61c3a202 diff --git a/proto/cache.proto b/proto/cache.proto index 40f918bedb..c80afef8e2 100644 --- a/proto/cache.proto +++ b/proto/cache.proto @@ -395,3 +395,14 @@ message AddressProto { string name = 1; string email = 2; } + +// Serialized form of com.google.gerrit.entities.NotifyConfig. +// Next ID: 7 +message NotifyConfigProto { + string name = 1; + repeated string type = 2; // ENUM as String + string filter = 3; + string header = 4; // ENUM as String + repeated GroupReferenceProto groups = 5; + repeated AddressProto addresses = 6; +}