From 3770c709ed634a466db3a24d180cdefb999b15b9 Mon Sep 17 00:00:00 2001 From: Dave Borowitz Date: Tue, 13 Nov 2018 17:07:14 -0800 Subject: [PATCH] Move RefUpdateUtil and LockFailureException to common git package Change-Id: I073c5c6fb86932a735ea9b43881283c2ce925bf8 --- java/com/google/gerrit/git/BUILD | 9 +++++ .../git/LockFailureException.java | 2 +- .../{server/update => git}/RefUpdateUtil.java | 3 +- java/com/google/gerrit/httpd/BUILD | 1 + .../gerrit/httpd/restapi/RestApiServlet.java | 2 +- java/com/google/gerrit/server/BUILD | 1 + .../gerrit/server/account/AccountsUpdate.java | 4 +-- .../google/gerrit/server/git/BanCommit.java | 1 + .../gerrit/server/git/NotesBranchUtil.java | 3 +- .../server/git/meta/VersionedMetaData.java | 2 +- .../gerrit/server/group/db/GroupsUpdate.java | 4 +-- .../server/notedb/CommentJsonMigrator.java | 2 +- .../google/gerrit/server/notedb/IntBlob.java | 2 +- .../server/notedb/NoteDbUpdateManager.java | 2 +- .../gerrit/server/notedb/RepoSequence.java | 2 +- .../server/notedb/rebuild/NoteDbMigrator.java | 4 +-- java/com/google/gerrit/server/schema/BUILD | 1 + .../server/schema/ReviewDbSchemaCreator.java | 2 +- .../gerrit/server/schema/Schema_167.java | 2 +- .../google/gerrit/server/submit/MergeOp.java | 2 +- .../gerrit/server/update/RetryHelper.java | 2 +- .../server/update/ReviewDbBatchUpdate.java | 2 +- .../acceptance/api/accounts/AccountIT.java | 2 +- .../gerrit/acceptance/api/accounts/BUILD | 1 + javatests/com/google/gerrit/git/BUILD | 34 +++++++++++++++++++ .../update => git}/RefUpdateUtilRepoTest.java | 2 +- .../update => git}/RefUpdateUtilTest.java | 3 +- javatests/com/google/gerrit/server/BUILD | 1 + .../git/meta/VersionedMetaDataTest.java | 2 +- .../com/google/gerrit/server/group/db/BUILD | 1 + .../server/group/db/GroupNameNotesTest.java | 2 +- .../server/schema/GroupRebuilderTest.java | 2 +- .../com/google/gerrit/server/update/BUILD | 23 +------------ plugins/BUILD | 1 + plugins/reviewnotes | 2 +- 35 files changed, 80 insertions(+), 51 deletions(-) create mode 100644 java/com/google/gerrit/git/BUILD rename java/com/google/gerrit/{server => }/git/LockFailureException.java (97%) rename java/com/google/gerrit/{server/update => git}/RefUpdateUtil.java (98%) create mode 100644 javatests/com/google/gerrit/git/BUILD rename javatests/com/google/gerrit/{server/update => git}/RefUpdateUtilRepoTest.java (98%) rename javatests/com/google/gerrit/{server/update => git}/RefUpdateUtilTest.java (97%) diff --git a/java/com/google/gerrit/git/BUILD b/java/com/google/gerrit/git/BUILD new file mode 100644 index 0000000000..f0c01debcd --- /dev/null +++ b/java/com/google/gerrit/git/BUILD @@ -0,0 +1,9 @@ +java_library( + name = "git", + srcs = glob(["*.java"]), + visibility = ["//visibility:public"], + deps = [ + "//lib:guava", + "//lib/jgit/org.eclipse.jgit:jgit", + ], +) diff --git a/java/com/google/gerrit/server/git/LockFailureException.java b/java/com/google/gerrit/git/LockFailureException.java similarity index 97% rename from java/com/google/gerrit/server/git/LockFailureException.java rename to java/com/google/gerrit/git/LockFailureException.java index 02a30e098b..b249749b06 100644 --- a/java/com/google/gerrit/server/git/LockFailureException.java +++ b/java/com/google/gerrit/git/LockFailureException.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.git; +package com.google.gerrit.git; import static com.google.common.collect.ImmutableList.toImmutableList; diff --git a/java/com/google/gerrit/server/update/RefUpdateUtil.java b/java/com/google/gerrit/git/RefUpdateUtil.java similarity index 98% rename from java/com/google/gerrit/server/update/RefUpdateUtil.java rename to java/com/google/gerrit/git/RefUpdateUtil.java index 514d86a435..ee74f2b533 100644 --- a/java/com/google/gerrit/server/update/RefUpdateUtil.java +++ b/java/com/google/gerrit/git/RefUpdateUtil.java @@ -12,10 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.update; +package com.google.gerrit.git; import com.google.common.annotations.VisibleForTesting; -import com.google.gerrit.server.git.LockFailureException; import java.io.IOException; import org.eclipse.jgit.internal.JGitText; import org.eclipse.jgit.lib.BatchRefUpdate; diff --git a/java/com/google/gerrit/httpd/BUILD b/java/com/google/gerrit/httpd/BUILD index 2294d0eca6..825473856c 100644 --- a/java/com/google/gerrit/httpd/BUILD +++ b/java/com/google/gerrit/httpd/BUILD @@ -11,6 +11,7 @@ java_library( "//java/com/google/gerrit/common:annotations", "//java/com/google/gerrit/common:server", "//java/com/google/gerrit/extensions:api", + "//java/com/google/gerrit/git", "//java/com/google/gerrit/launcher", "//java/com/google/gerrit/lifecycle", "//java/com/google/gerrit/metrics", diff --git a/java/com/google/gerrit/httpd/restapi/RestApiServlet.java b/java/com/google/gerrit/httpd/restapi/RestApiServlet.java index 519a218734..ec71d8fea9 100644 --- a/java/com/google/gerrit/httpd/restapi/RestApiServlet.java +++ b/java/com/google/gerrit/httpd/restapi/RestApiServlet.java @@ -97,6 +97,7 @@ import com.google.gerrit.extensions.restapi.RestResource; import com.google.gerrit.extensions.restapi.RestView; import com.google.gerrit.extensions.restapi.TopLevelResource; import com.google.gerrit.extensions.restapi.UnprocessableEntityException; +import com.google.gerrit.git.LockFailureException; import com.google.gerrit.httpd.WebSession; import com.google.gerrit.httpd.restapi.ParameterParser.QueryParams; import com.google.gerrit.server.AccessPath; @@ -108,7 +109,6 @@ import com.google.gerrit.server.audit.AuditService; import com.google.gerrit.server.audit.ExtendedHttpAuditEvent; import com.google.gerrit.server.cache.PerThreadCache; import com.google.gerrit.server.config.GerritServerConfig; -import com.google.gerrit.server.git.LockFailureException; import com.google.gerrit.server.logging.RequestId; import com.google.gerrit.server.logging.TraceContext; import com.google.gerrit.server.permissions.GlobalPermission; diff --git a/java/com/google/gerrit/server/BUILD b/java/com/google/gerrit/server/BUILD index 0d48bcad57..84018521a2 100644 --- a/java/com/google/gerrit/server/BUILD +++ b/java/com/google/gerrit/server/BUILD @@ -32,6 +32,7 @@ java_library( "//java/com/google/gerrit/common:annotations", "//java/com/google/gerrit/common:server", "//java/com/google/gerrit/extensions:api", + "//java/com/google/gerrit/git", "//java/com/google/gerrit/index", "//java/com/google/gerrit/index:query_exception", "//java/com/google/gerrit/index/project", diff --git a/java/com/google/gerrit/server/account/AccountsUpdate.java b/java/com/google/gerrit/server/account/AccountsUpdate.java index 1445dfdad9..ff1c50b259 100644 --- a/java/com/google/gerrit/server/account/AccountsUpdate.java +++ b/java/com/google/gerrit/server/account/AccountsUpdate.java @@ -25,6 +25,8 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.util.concurrent.Runnables; import com.google.gerrit.common.Nullable; +import com.google.gerrit.git.LockFailureException; +import com.google.gerrit.git.RefUpdateUtil; import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.server.GerritPersonIdent; import com.google.gerrit.server.IdentifiedUser; @@ -35,10 +37,8 @@ import com.google.gerrit.server.account.externalids.ExternalIds; import com.google.gerrit.server.config.AllUsersName; import com.google.gerrit.server.extensions.events.GitReferenceUpdated; import com.google.gerrit.server.git.GitRepositoryManager; -import com.google.gerrit.server.git.LockFailureException; import com.google.gerrit.server.git.meta.MetaDataUpdate; import com.google.gerrit.server.index.change.ReindexAfterRefUpdate; -import com.google.gerrit.server.update.RefUpdateUtil; import com.google.gerrit.server.update.RetryHelper; import com.google.gerrit.server.update.RetryHelper.Action; import com.google.gerrit.server.update.RetryHelper.ActionType; diff --git a/java/com/google/gerrit/server/git/BanCommit.java b/java/com/google/gerrit/server/git/BanCommit.java index 49917156c7..3cb771ec70 100644 --- a/java/com/google/gerrit/server/git/BanCommit.java +++ b/java/com/google/gerrit/server/git/BanCommit.java @@ -18,6 +18,7 @@ import static com.google.gerrit.reviewdb.client.RefNames.REFS_REJECT_COMMITS; import static java.nio.charset.StandardCharsets.UTF_8; import com.google.gerrit.extensions.restapi.AuthException; +import com.google.gerrit.git.LockFailureException; import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.reviewdb.client.RefNames; import com.google.gerrit.server.CurrentUser; diff --git a/java/com/google/gerrit/server/git/NotesBranchUtil.java b/java/com/google/gerrit/server/git/NotesBranchUtil.java index 24b372772a..1636b85571 100644 --- a/java/com/google/gerrit/server/git/NotesBranchUtil.java +++ b/java/com/google/gerrit/server/git/NotesBranchUtil.java @@ -16,10 +16,11 @@ package com.google.gerrit.server.git; import static com.google.common.base.MoreObjects.firstNonNull; +import com.google.gerrit.git.LockFailureException; +import com.google.gerrit.git.RefUpdateUtil; import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.server.GerritPersonIdent; import com.google.gerrit.server.extensions.events.GitReferenceUpdated; -import com.google.gerrit.server.update.RefUpdateUtil; import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; import java.io.IOException; diff --git a/java/com/google/gerrit/server/git/meta/VersionedMetaData.java b/java/com/google/gerrit/server/git/meta/VersionedMetaData.java index 8b14177b96..196267eba5 100644 --- a/java/com/google/gerrit/server/git/meta/VersionedMetaData.java +++ b/java/com/google/gerrit/server/git/meta/VersionedMetaData.java @@ -19,8 +19,8 @@ import static com.google.common.base.Preconditions.checkArgument; import com.google.common.base.MoreObjects; import com.google.common.flogger.FluentLogger; import com.google.gerrit.common.Nullable; +import com.google.gerrit.git.LockFailureException; import com.google.gerrit.reviewdb.client.Project; -import com.google.gerrit.server.git.LockFailureException; import java.io.BufferedReader; import java.io.IOException; import java.io.StringReader; diff --git a/java/com/google/gerrit/server/group/db/GroupsUpdate.java b/java/com/google/gerrit/server/group/db/GroupsUpdate.java index 6477f31702..ecb9b2d771 100644 --- a/java/com/google/gerrit/server/group/db/GroupsUpdate.java +++ b/java/com/google/gerrit/server/group/db/GroupsUpdate.java @@ -21,6 +21,8 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; import com.google.gerrit.common.Nullable; import com.google.gerrit.common.errors.NoSuchGroupException; +import com.google.gerrit.git.LockFailureException; +import com.google.gerrit.git.RefUpdateUtil; import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.reviewdb.client.AccountGroup; import com.google.gerrit.reviewdb.client.Project; @@ -34,12 +36,10 @@ import com.google.gerrit.server.config.AllUsersName; import com.google.gerrit.server.config.GerritServerId; import com.google.gerrit.server.extensions.events.GitReferenceUpdated; import com.google.gerrit.server.git.GitRepositoryManager; -import com.google.gerrit.server.git.LockFailureException; import com.google.gerrit.server.git.meta.MetaDataUpdate; import com.google.gerrit.server.group.GroupAuditService; import com.google.gerrit.server.group.InternalGroup; import com.google.gerrit.server.index.group.GroupIndexer; -import com.google.gerrit.server.update.RefUpdateUtil; import com.google.gerrit.server.update.RetryHelper; import com.google.gerrit.server.util.time.TimeUtil; import com.google.gwtorm.server.OrmDuplicateKeyException; diff --git a/java/com/google/gerrit/server/notedb/CommentJsonMigrator.java b/java/com/google/gerrit/server/notedb/CommentJsonMigrator.java index b250a34e4c..e122754c49 100644 --- a/java/com/google/gerrit/server/notedb/CommentJsonMigrator.java +++ b/java/com/google/gerrit/server/notedb/CommentJsonMigrator.java @@ -20,6 +20,7 @@ import static org.eclipse.jgit.lib.Constants.OBJ_BLOB; import com.google.common.collect.ImmutableList; import com.google.common.flogger.FluentLogger; +import com.google.gerrit.git.RefUpdateUtil; import com.google.gerrit.reviewdb.client.Change; import com.google.gerrit.reviewdb.client.PatchLineComment.Status; import com.google.gerrit.reviewdb.client.Project; @@ -27,7 +28,6 @@ import com.google.gerrit.reviewdb.client.RefNames; import com.google.gerrit.reviewdb.client.RevId; import com.google.gerrit.server.config.AllUsersName; import com.google.gerrit.server.config.GerritServerIdProvider; -import com.google.gerrit.server.update.RefUpdateUtil; import com.google.inject.Inject; import com.google.inject.Singleton; import java.io.IOException; diff --git a/java/com/google/gerrit/server/notedb/IntBlob.java b/java/com/google/gerrit/server/notedb/IntBlob.java index edef5cc28c..9bac2a48a2 100644 --- a/java/com/google/gerrit/server/notedb/IntBlob.java +++ b/java/com/google/gerrit/server/notedb/IntBlob.java @@ -21,9 +21,9 @@ import com.google.auto.value.AutoValue; import com.google.common.base.CharMatcher; import com.google.common.primitives.Ints; import com.google.gerrit.common.Nullable; +import com.google.gerrit.git.RefUpdateUtil; import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.server.extensions.events.GitReferenceUpdated; -import com.google.gerrit.server.update.RefUpdateUtil; import com.google.gwtorm.server.OrmException; import java.io.IOException; import java.util.Optional; diff --git a/java/com/google/gerrit/server/notedb/NoteDbUpdateManager.java b/java/com/google/gerrit/server/notedb/NoteDbUpdateManager.java index 12448fb95b..046757d405 100644 --- a/java/com/google/gerrit/server/notedb/NoteDbUpdateManager.java +++ b/java/com/google/gerrit/server/notedb/NoteDbUpdateManager.java @@ -30,6 +30,7 @@ import com.google.common.collect.MultimapBuilder; import com.google.common.collect.Table; import com.google.gerrit.common.Nullable; import com.google.gerrit.extensions.restapi.RestModifyView; +import com.google.gerrit.git.RefUpdateUtil; import com.google.gerrit.metrics.Timer1; import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.reviewdb.client.Change; @@ -42,7 +43,6 @@ import com.google.gerrit.server.git.InMemoryInserter; import com.google.gerrit.server.git.InsertedObject; import com.google.gerrit.server.notedb.NoteDbChangeState.PrimaryStorage; import com.google.gerrit.server.update.ChainedReceiveCommands; -import com.google.gerrit.server.update.RefUpdateUtil; import com.google.gerrit.server.update.RetryingRestModifyView; import com.google.gwtorm.server.OrmConcurrencyException; import com.google.gwtorm.server.OrmException; diff --git a/java/com/google/gerrit/server/notedb/RepoSequence.java b/java/com/google/gerrit/server/notedb/RepoSequence.java index 859b56163f..56264e95c6 100644 --- a/java/com/google/gerrit/server/notedb/RepoSequence.java +++ b/java/com/google/gerrit/server/notedb/RepoSequence.java @@ -30,11 +30,11 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Throwables; import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.Runnables; +import com.google.gerrit.git.RefUpdateUtil; import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.reviewdb.client.RefNames; import com.google.gerrit.server.extensions.events.GitReferenceUpdated; import com.google.gerrit.server.git.GitRepositoryManager; -import com.google.gerrit.server.update.RefUpdateUtil; import com.google.gwtorm.server.OrmException; import java.io.IOException; import java.util.ArrayList; diff --git a/java/com/google/gerrit/server/notedb/rebuild/NoteDbMigrator.java b/java/com/google/gerrit/server/notedb/rebuild/NoteDbMigrator.java index 225926d69b..01ac3e2e04 100644 --- a/java/com/google/gerrit/server/notedb/rebuild/NoteDbMigrator.java +++ b/java/com/google/gerrit/server/notedb/rebuild/NoteDbMigrator.java @@ -46,6 +46,8 @@ import com.google.common.util.concurrent.MoreExecutors; import com.google.gerrit.common.FormatUtil; import com.google.gerrit.common.Nullable; import com.google.gerrit.extensions.registration.DynamicSet; +import com.google.gerrit.git.LockFailureException; +import com.google.gerrit.git.RefUpdateUtil; import com.google.gerrit.reviewdb.client.Change; import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.reviewdb.server.ReviewDb; @@ -59,7 +61,6 @@ import com.google.gerrit.server.config.GerritServerConfigProvider; import com.google.gerrit.server.config.SitePaths; import com.google.gerrit.server.extensions.events.GitReferenceUpdated; import com.google.gerrit.server.git.GitRepositoryManager; -import com.google.gerrit.server.git.LockFailureException; import com.google.gerrit.server.git.WorkQueue; import com.google.gerrit.server.notedb.ChangeBundleReader; import com.google.gerrit.server.notedb.ChangeNotes; @@ -73,7 +74,6 @@ import com.google.gerrit.server.notedb.RepoSequence; import com.google.gerrit.server.notedb.rebuild.ChangeRebuilder.NoPatchSetsException; import com.google.gerrit.server.project.NoSuchChangeException; import com.google.gerrit.server.update.ChainedReceiveCommands; -import com.google.gerrit.server.update.RefUpdateUtil; import com.google.gerrit.server.util.ManualRequestContext; import com.google.gerrit.server.util.ThreadLocalRequestContext; import com.google.gwtorm.server.OrmException; diff --git a/java/com/google/gerrit/server/schema/BUILD b/java/com/google/gerrit/server/schema/BUILD index a04def6c74..93cad1905b 100644 --- a/java/com/google/gerrit/server/schema/BUILD +++ b/java/com/google/gerrit/server/schema/BUILD @@ -8,6 +8,7 @@ java_library( "//java/com/google/gerrit/common:annotations", "//java/com/google/gerrit/common:server", "//java/com/google/gerrit/extensions:api", + "//java/com/google/gerrit/git", "//java/com/google/gerrit/lifecycle", "//java/com/google/gerrit/metrics", "//java/com/google/gerrit/reviewdb:server", diff --git a/java/com/google/gerrit/server/schema/ReviewDbSchemaCreator.java b/java/com/google/gerrit/server/schema/ReviewDbSchemaCreator.java index 30d07f32a0..2aaf26eff6 100644 --- a/java/com/google/gerrit/server/schema/ReviewDbSchemaCreator.java +++ b/java/com/google/gerrit/server/schema/ReviewDbSchemaCreator.java @@ -17,6 +17,7 @@ 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.git.RefUpdateUtil; import com.google.gerrit.metrics.MetricMaker; import com.google.gerrit.reviewdb.client.AccountGroup; import com.google.gerrit.reviewdb.client.CurrentSchemaVersion; @@ -43,7 +44,6 @@ import com.google.gerrit.server.group.db.InternalGroupUpdate; import com.google.gerrit.server.index.group.GroupIndex; import com.google.gerrit.server.index.group.GroupIndexCollection; import com.google.gerrit.server.notedb.NotesMigration; -import com.google.gerrit.server.update.RefUpdateUtil; import com.google.gwtorm.jdbc.JdbcExecutor; import com.google.gwtorm.jdbc.JdbcSchema; import com.google.gwtorm.server.OrmDuplicateKeyException; diff --git a/java/com/google/gerrit/server/schema/Schema_167.java b/java/com/google/gerrit/server/schema/Schema_167.java index 15fcddd333..44d89f934e 100644 --- a/java/com/google/gerrit/server/schema/Schema_167.java +++ b/java/com/google/gerrit/server/schema/Schema_167.java @@ -24,6 +24,7 @@ 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.git.RefUpdateUtil; import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.reviewdb.client.AccountGroup; import com.google.gerrit.reviewdb.client.RefNames; @@ -39,7 +40,6 @@ import com.google.gerrit.server.git.GitRepositoryManager; import com.google.gerrit.server.group.SystemGroupBackend; import com.google.gerrit.server.group.db.AuditLogFormatter; import com.google.gerrit.server.group.db.GroupNameNotes; -import com.google.gerrit.server.update.RefUpdateUtil; import com.google.gwtorm.server.OrmException; import com.google.inject.Inject; import com.google.inject.Provider; diff --git a/java/com/google/gerrit/server/submit/MergeOp.java b/java/com/google/gerrit/server/submit/MergeOp.java index e27863f993..8e018a5bde 100644 --- a/java/com/google/gerrit/server/submit/MergeOp.java +++ b/java/com/google/gerrit/server/submit/MergeOp.java @@ -42,6 +42,7 @@ import com.google.gerrit.extensions.restapi.AuthException; import com.google.gerrit.extensions.restapi.ResourceConflictException; import com.google.gerrit.extensions.restapi.ResourceNotFoundException; import com.google.gerrit.extensions.restapi.RestApiException; +import com.google.gerrit.git.LockFailureException; import com.google.gerrit.metrics.Counter0; import com.google.gerrit.metrics.Description; import com.google.gerrit.metrics.MetricMaker; @@ -57,7 +58,6 @@ import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.server.InternalUser; import com.google.gerrit.server.change.NotifyUtil; import com.google.gerrit.server.git.CodeReviewCommit; -import com.google.gerrit.server.git.LockFailureException; import com.google.gerrit.server.git.MergeTip; import com.google.gerrit.server.git.validators.MergeValidationException; import com.google.gerrit.server.git.validators.MergeValidators; diff --git a/java/com/google/gerrit/server/update/RetryHelper.java b/java/com/google/gerrit/server/update/RetryHelper.java index 10e3455b6e..c8d338b1ce 100644 --- a/java/com/google/gerrit/server/update/RetryHelper.java +++ b/java/com/google/gerrit/server/update/RetryHelper.java @@ -34,13 +34,13 @@ import com.google.common.collect.Maps; import com.google.common.flogger.FluentLogger; import com.google.gerrit.common.Nullable; import com.google.gerrit.extensions.restapi.RestApiException; +import com.google.gerrit.git.LockFailureException; import com.google.gerrit.metrics.Counter1; import com.google.gerrit.metrics.Description; import com.google.gerrit.metrics.Field; import com.google.gerrit.metrics.Histogram1; import com.google.gerrit.metrics.MetricMaker; import com.google.gerrit.server.config.GerritServerConfig; -import com.google.gerrit.server.git.LockFailureException; import com.google.gerrit.server.notedb.NotesMigration; import com.google.inject.Inject; import com.google.inject.Singleton; diff --git a/java/com/google/gerrit/server/update/ReviewDbBatchUpdate.java b/java/com/google/gerrit/server/update/ReviewDbBatchUpdate.java index c06447d337..b859895bd6 100644 --- a/java/com/google/gerrit/server/update/ReviewDbBatchUpdate.java +++ b/java/com/google/gerrit/server/update/ReviewDbBatchUpdate.java @@ -30,6 +30,7 @@ import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; import com.google.gerrit.extensions.restapi.ResourceConflictException; import com.google.gerrit.extensions.restapi.RestApiException; +import com.google.gerrit.git.LockFailureException; import com.google.gerrit.metrics.Description; import com.google.gerrit.metrics.Description.Units; import com.google.gerrit.metrics.Field; @@ -48,7 +49,6 @@ import com.google.gerrit.server.config.GerritServerConfig; import com.google.gerrit.server.extensions.events.GitReferenceUpdated; import com.google.gerrit.server.git.GitRepositoryManager; import com.google.gerrit.server.git.InsertedObject; -import com.google.gerrit.server.git.LockFailureException; import com.google.gerrit.server.index.change.ChangeIndexer; import com.google.gerrit.server.logging.TraceContext; import com.google.gerrit.server.notedb.ChangeNotes; diff --git a/javatests/com/google/gerrit/acceptance/api/accounts/AccountIT.java b/javatests/com/google/gerrit/acceptance/api/accounts/AccountIT.java index 9886db53a2..0f195b57b2 100644 --- a/javatests/com/google/gerrit/acceptance/api/accounts/AccountIT.java +++ b/javatests/com/google/gerrit/acceptance/api/accounts/AccountIT.java @@ -93,6 +93,7 @@ import com.google.gerrit.extensions.restapi.ResourceConflictException; import com.google.gerrit.extensions.restapi.ResourceNotFoundException; import com.google.gerrit.extensions.restapi.RestApiException; import com.google.gerrit.extensions.restapi.UnprocessableEntityException; +import com.google.gerrit.git.LockFailureException; import com.google.gerrit.gpg.Fingerprint; import com.google.gerrit.gpg.PublicKeyStore; import com.google.gerrit.gpg.testing.TestKey; @@ -118,7 +119,6 @@ import com.google.gerrit.server.account.externalids.ExternalId; import com.google.gerrit.server.account.externalids.ExternalIdNotes; import com.google.gerrit.server.account.externalids.ExternalIds; import com.google.gerrit.server.extensions.events.GitReferenceUpdated; -import com.google.gerrit.server.git.LockFailureException; import com.google.gerrit.server.git.meta.MetaDataUpdate; import com.google.gerrit.server.index.account.AccountIndexer; import com.google.gerrit.server.index.account.StalenessChecker; diff --git a/javatests/com/google/gerrit/acceptance/api/accounts/BUILD b/javatests/com/google/gerrit/acceptance/api/accounts/BUILD index 31f3f91fce..2167d27efd 100644 --- a/javatests/com/google/gerrit/acceptance/api/accounts/BUILD +++ b/javatests/com/google/gerrit/acceptance/api/accounts/BUILD @@ -9,6 +9,7 @@ acceptance_tests( "no_windows", ], deps = [ + "//java/com/google/gerrit/git", "//java/com/google/gerrit/mail", "//java/com/google/gerrit/server/util/time", ], diff --git a/javatests/com/google/gerrit/git/BUILD b/javatests/com/google/gerrit/git/BUILD new file mode 100644 index 0000000000..458bdf9ed0 --- /dev/null +++ b/javatests/com/google/gerrit/git/BUILD @@ -0,0 +1,34 @@ +load("//tools/bzl:junit.bzl", "junit_tests") + +MEDIUM_TESTS = ["RefUpdateUtilRepoTest.java"] + +junit_tests( + name = "medium_tests", + size = "medium", + timeout = "short", + srcs = MEDIUM_TESTS, + tags = ["no_windows"], + deps = [ + "//java/com/google/gerrit/git", + "//lib:guava", + "//lib:junit", + "//lib/jgit/org.eclipse.jgit:jgit", + "//lib/jgit/org.eclipse.jgit.junit:junit", + "//lib/truth", + ], +) + +junit_tests( + name = "small_tests", + size = "small", + srcs = glob( + ["*.java"], + exclude = MEDIUM_TESTS, + ), + deps = [ + "//java/com/google/gerrit/git", + "//lib:guava", + "//lib/jgit/org.eclipse.jgit:jgit", + "//lib/truth", + ], +) diff --git a/javatests/com/google/gerrit/server/update/RefUpdateUtilRepoTest.java b/javatests/com/google/gerrit/git/RefUpdateUtilRepoTest.java similarity index 98% rename from javatests/com/google/gerrit/server/update/RefUpdateUtilRepoTest.java rename to javatests/com/google/gerrit/git/RefUpdateUtilRepoTest.java index fe9d522ed2..99247b80b2 100644 --- a/javatests/com/google/gerrit/server/update/RefUpdateUtilRepoTest.java +++ b/javatests/com/google/gerrit/git/RefUpdateUtilRepoTest.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.update; +package com.google.gerrit.git; import static com.google.common.truth.Truth.assertThat; diff --git a/javatests/com/google/gerrit/server/update/RefUpdateUtilTest.java b/javatests/com/google/gerrit/git/RefUpdateUtilTest.java similarity index 97% rename from javatests/com/google/gerrit/server/update/RefUpdateUtilTest.java rename to javatests/com/google/gerrit/git/RefUpdateUtilTest.java index fc8696aed4..fe40fb46ec 100644 --- a/javatests/com/google/gerrit/server/update/RefUpdateUtilTest.java +++ b/javatests/com/google/gerrit/git/RefUpdateUtilTest.java @@ -12,14 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.update; +package com.google.gerrit.git; import static com.google.common.base.Preconditions.checkState; import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assert_; import com.google.common.collect.ImmutableList; -import com.google.gerrit.server.git.LockFailureException; import java.io.IOException; import java.util.function.Consumer; import org.eclipse.jgit.internal.storage.dfs.DfsRepositoryDescription; diff --git a/javatests/com/google/gerrit/server/BUILD b/javatests/com/google/gerrit/server/BUILD index 8749b7a056..88edc2e4ce 100644 --- a/javatests/com/google/gerrit/server/BUILD +++ b/javatests/com/google/gerrit/server/BUILD @@ -38,6 +38,7 @@ junit_tests( "//java/com/google/gerrit/common:server", "//java/com/google/gerrit/extensions:api", "//java/com/google/gerrit/extensions/common/testing:common-test-util", + "//java/com/google/gerrit/git", "//java/com/google/gerrit/index", "//java/com/google/gerrit/index:query_exception", "//java/com/google/gerrit/lifecycle", diff --git a/javatests/com/google/gerrit/server/git/meta/VersionedMetaDataTest.java b/javatests/com/google/gerrit/server/git/meta/VersionedMetaDataTest.java index 7e12439ab0..7ed6c50862 100644 --- a/javatests/com/google/gerrit/server/git/meta/VersionedMetaDataTest.java +++ b/javatests/com/google/gerrit/server/git/meta/VersionedMetaDataTest.java @@ -22,10 +22,10 @@ import static com.google.common.truth.Truth8.assertThat; import com.google.common.collect.ImmutableList; import com.google.common.collect.Streams; import com.google.gerrit.common.Nullable; +import com.google.gerrit.git.RefUpdateUtil; import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.server.extensions.events.GitReferenceUpdated; import com.google.gerrit.server.git.meta.VersionedMetaData.BatchMetaDataUpdate; -import com.google.gerrit.server.update.RefUpdateUtil; import com.google.gerrit.server.util.time.TimeUtil; import com.google.gerrit.testing.TestTimeUtil; import java.io.IOException; diff --git a/javatests/com/google/gerrit/server/group/db/BUILD b/javatests/com/google/gerrit/server/group/db/BUILD index f3dd5d61af..d02fa1b1fa 100644 --- a/javatests/com/google/gerrit/server/group/db/BUILD +++ b/javatests/com/google/gerrit/server/group/db/BUILD @@ -10,6 +10,7 @@ junit_tests( "//java/com/google/gerrit/common/data/testing:common-data-test-util", "//java/com/google/gerrit/extensions:api", "//java/com/google/gerrit/extensions/common/testing:common-test-util", + "//java/com/google/gerrit/git", "//java/com/google/gerrit/reviewdb:server", "//java/com/google/gerrit/server", "//java/com/google/gerrit/server/group/db/testing", diff --git a/javatests/com/google/gerrit/server/group/db/GroupNameNotesTest.java b/javatests/com/google/gerrit/server/group/db/GroupNameNotesTest.java index 42d01e2bfd..7364c9526c 100644 --- a/javatests/com/google/gerrit/server/group/db/GroupNameNotesTest.java +++ b/javatests/com/google/gerrit/server/group/db/GroupNameNotesTest.java @@ -27,6 +27,7 @@ import com.google.gerrit.common.data.GroupReference; import com.google.gerrit.common.data.testing.GroupReferenceSubject; import com.google.gerrit.extensions.common.CommitInfo; import com.google.gerrit.extensions.common.testing.CommitInfoSubject; +import com.google.gerrit.git.RefUpdateUtil; import com.google.gerrit.reviewdb.client.AccountGroup; import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.reviewdb.client.RefNames; @@ -34,7 +35,6 @@ import com.google.gerrit.server.config.AllUsersName; import com.google.gerrit.server.config.AllUsersNameProvider; import com.google.gerrit.server.extensions.events.GitReferenceUpdated; import com.google.gerrit.server.git.meta.MetaDataUpdate; -import com.google.gerrit.server.update.RefUpdateUtil; import com.google.gerrit.server.util.time.TimeUtil; import com.google.gerrit.testing.GitTestUtil; import com.google.gerrit.testing.TestTimeUtil; diff --git a/javatests/com/google/gerrit/server/schema/GroupRebuilderTest.java b/javatests/com/google/gerrit/server/schema/GroupRebuilderTest.java index bf6953afcd..6a8a55a434 100644 --- a/javatests/com/google/gerrit/server/schema/GroupRebuilderTest.java +++ b/javatests/com/google/gerrit/server/schema/GroupRebuilderTest.java @@ -25,6 +25,7 @@ import com.google.gerrit.common.Nullable; import com.google.gerrit.common.data.GroupDescription; import com.google.gerrit.common.data.GroupReference; import com.google.gerrit.extensions.common.CommitInfo; +import com.google.gerrit.git.RefUpdateUtil; import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.reviewdb.client.AccountGroup; import com.google.gerrit.reviewdb.client.AccountGroupById; @@ -37,7 +38,6 @@ import com.google.gerrit.server.config.AllUsersNameProvider; import com.google.gerrit.server.group.db.AuditLogFormatter; import com.google.gerrit.server.group.db.AuditLogReader; import com.google.gerrit.server.group.db.GroupNameNotes; -import com.google.gerrit.server.update.RefUpdateUtil; import com.google.gerrit.server.util.time.TimeUtil; import com.google.gerrit.testing.GerritBaseTests; import com.google.gerrit.testing.GitTestUtil; diff --git a/javatests/com/google/gerrit/server/update/BUILD b/javatests/com/google/gerrit/server/update/BUILD index cef3d631f8..9117e853c1 100644 --- a/javatests/com/google/gerrit/server/update/BUILD +++ b/javatests/com/google/gerrit/server/update/BUILD @@ -1,30 +1,9 @@ load("//tools/bzl:junit.bzl", "junit_tests") -MEDIUM_TESTS = ["RefUpdateUtilRepoTest.java"] - -junit_tests( - name = "medium_tests", - size = "medium", - timeout = "short", - srcs = MEDIUM_TESTS, - tags = ["no_windows"], - deps = [ - "//java/com/google/gerrit/server", - "//lib:guava", - "//lib:junit", - "//lib/jgit/org.eclipse.jgit:jgit", - "//lib/jgit/org.eclipse.jgit.junit:junit", - "//lib/truth", - ], -) - junit_tests( name = "small_tests", size = "small", - srcs = glob( - ["*.java"], - exclude = MEDIUM_TESTS, - ), + srcs = glob(["*.java"]), deps = [ "//java/com/google/gerrit/common:server", "//java/com/google/gerrit/lifecycle", diff --git a/plugins/BUILD b/plugins/BUILD index 137be6edc6..1ce0fba737 100644 --- a/plugins/BUILD +++ b/plugins/BUILD @@ -31,6 +31,7 @@ EXPORTS = [ "//java/com/google/gerrit/common:annotations", "//java/com/google/gerrit/common:server", "//java/com/google/gerrit/extensions:api", + "//java/com/google/gerrit/git", "//java/com/google/gerrit/index", "//java/com/google/gerrit/index:query_exception", "//java/com/google/gerrit/lifecycle", diff --git a/plugins/reviewnotes b/plugins/reviewnotes index 131f5782a6..041ac8d9fb 160000 --- a/plugins/reviewnotes +++ b/plugins/reviewnotes @@ -1 +1 @@ -Subproject commit 131f5782a6723d1e017f53cf4e56ff363263b076 +Subproject commit 041ac8d9fb0c0e5adff0aa37773a1931aced5a9a