diff --git a/java/com/google/gerrit/acceptance/AcceptanceTestRequestScope.java b/java/com/google/gerrit/acceptance/AcceptanceTestRequestScope.java index 3acee779f0..9a3e811157 100644 --- a/java/com/google/gerrit/acceptance/AcceptanceTestRequestScope.java +++ b/java/com/google/gerrit/acceptance/AcceptanceTestRequestScope.java @@ -14,7 +14,6 @@ package com.google.gerrit.acceptance; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.reviewdb.server.ReviewDb; import com.google.gerrit.server.CurrentUser; import com.google.gerrit.server.RequestCleanup; @@ -22,6 +21,7 @@ import com.google.gerrit.server.config.RequestScopedReviewDbProvider; import com.google.gerrit.server.util.RequestContext; import com.google.gerrit.server.util.ThreadLocalRequestContext; import com.google.gerrit.server.util.ThreadLocalRequestScopePropagator; +import com.google.gerrit.server.util.time.TimeUtil; import com.google.gerrit.testing.DisabledReviewDb; import com.google.gwtorm.server.SchemaFactory; import com.google.inject.Inject; diff --git a/java/com/google/gerrit/acceptance/BUILD b/java/com/google/gerrit/acceptance/BUILD index 0214cead6c..861372dd9a 100644 --- a/java/com/google/gerrit/acceptance/BUILD +++ b/java/com/google/gerrit/acceptance/BUILD @@ -109,6 +109,7 @@ java_library2( "//java/com/google/gerrit/server/git/receive", "//java/com/google/gerrit/server/restapi", "//java/com/google/gerrit/server/schema", + "//java/com/google/gerrit/server/util/time", "//lib:gson", "//lib:guava-retrying", "//lib:gwtorm", diff --git a/java/com/google/gerrit/httpd/BUILD b/java/com/google/gerrit/httpd/BUILD index e2e0d60c2d..2294d0eca6 100644 --- a/java/com/google/gerrit/httpd/BUILD +++ b/java/com/google/gerrit/httpd/BUILD @@ -21,6 +21,7 @@ java_library( "//java/com/google/gerrit/server/ioutil", "//java/com/google/gerrit/server/logging", "//java/com/google/gerrit/server/restapi", + "//java/com/google/gerrit/server/util/time", "//java/com/google/gerrit/util/cli", "//java/com/google/gerrit/util/http", "//java/org/eclipse/jgit:server", diff --git a/java/com/google/gerrit/httpd/HttpLogoutServlet.java b/java/com/google/gerrit/httpd/HttpLogoutServlet.java index 39a39c6a58..abfcc22df4 100644 --- a/java/com/google/gerrit/httpd/HttpLogoutServlet.java +++ b/java/com/google/gerrit/httpd/HttpLogoutServlet.java @@ -16,13 +16,13 @@ package com.google.gerrit.httpd; import com.google.common.base.Strings; import com.google.gerrit.common.Nullable; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.extensions.registration.DynamicItem; import com.google.gerrit.server.CurrentUser; import com.google.gerrit.server.audit.AuditEvent; import com.google.gerrit.server.audit.AuditService; import com.google.gerrit.server.config.AuthConfig; import com.google.gerrit.server.config.CanonicalWebUrl; +import com.google.gerrit.server.util.time.TimeUtil; import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; diff --git a/java/com/google/gerrit/httpd/WebSessionManager.java b/java/com/google/gerrit/httpd/WebSessionManager.java index 457e65fc48..cb1e965352 100644 --- a/java/com/google/gerrit/httpd/WebSessionManager.java +++ b/java/com/google/gerrit/httpd/WebSessionManager.java @@ -14,7 +14,6 @@ package com.google.gerrit.httpd; -import static com.google.gerrit.common.TimeUtil.nowMs; import static com.google.gerrit.httpd.CacheBasedWebSession.MAX_AGE_MINUTES; import static com.google.gerrit.server.ioutil.BasicSerialization.readFixInt64; import static com.google.gerrit.server.ioutil.BasicSerialization.readString; @@ -23,6 +22,7 @@ import static com.google.gerrit.server.ioutil.BasicSerialization.writeBytes; import static com.google.gerrit.server.ioutil.BasicSerialization.writeFixInt64; import static com.google.gerrit.server.ioutil.BasicSerialization.writeString; import static com.google.gerrit.server.ioutil.BasicSerialization.writeVarInt32; +import static com.google.gerrit.server.util.time.TimeUtil.nowMs; import static java.util.concurrent.TimeUnit.HOURS; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static java.util.concurrent.TimeUnit.MINUTES; diff --git a/java/com/google/gerrit/httpd/raw/BazelBuild.java b/java/com/google/gerrit/httpd/raw/BazelBuild.java index 2b390a92e1..430f0b518d 100644 --- a/java/com/google/gerrit/httpd/raw/BazelBuild.java +++ b/java/com/google/gerrit/httpd/raw/BazelBuild.java @@ -22,8 +22,8 @@ import com.google.common.escape.Escaper; import com.google.common.flogger.FluentLogger; import com.google.common.html.HtmlEscapers; import com.google.common.io.ByteStreams; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.launcher.GerritLauncher; +import com.google.gerrit.server.util.time.TimeUtil; import com.google.gerrit.util.http.CacheHeaders; import java.io.IOException; import java.io.InputStream; diff --git a/java/com/google/gerrit/httpd/raw/DirectoryGwtUiServlet.java b/java/com/google/gerrit/httpd/raw/DirectoryGwtUiServlet.java index 0f3e342631..8ac1601826 100644 --- a/java/com/google/gerrit/httpd/raw/DirectoryGwtUiServlet.java +++ b/java/com/google/gerrit/httpd/raw/DirectoryGwtUiServlet.java @@ -15,7 +15,7 @@ package com.google.gerrit.httpd.raw; import com.google.common.cache.Cache; -import com.google.gerrit.common.TimeUtil; +import com.google.gerrit.server.util.time.TimeUtil; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; diff --git a/java/com/google/gerrit/httpd/raw/PolyGerritUiServlet.java b/java/com/google/gerrit/httpd/raw/PolyGerritUiServlet.java index c508b2d8be..c7d23de4d8 100644 --- a/java/com/google/gerrit/httpd/raw/PolyGerritUiServlet.java +++ b/java/com/google/gerrit/httpd/raw/PolyGerritUiServlet.java @@ -15,7 +15,7 @@ package com.google.gerrit.httpd.raw; import com.google.common.cache.Cache; -import com.google.gerrit.common.TimeUtil; +import com.google.gerrit.server.util.time.TimeUtil; import java.io.IOException; import java.nio.file.FileSystems; import java.nio.file.Path; diff --git a/java/com/google/gerrit/httpd/raw/WarDocServlet.java b/java/com/google/gerrit/httpd/raw/WarDocServlet.java index 3f6ff25653..27520e3f01 100644 --- a/java/com/google/gerrit/httpd/raw/WarDocServlet.java +++ b/java/com/google/gerrit/httpd/raw/WarDocServlet.java @@ -15,7 +15,7 @@ package com.google.gerrit.httpd.raw; import com.google.common.cache.Cache; -import com.google.gerrit.common.TimeUtil; +import com.google.gerrit.server.util.time.TimeUtil; import java.nio.file.FileSystem; import java.nio.file.Path; import java.nio.file.attribute.FileTime; diff --git a/java/com/google/gerrit/httpd/raw/WarGwtUiServlet.java b/java/com/google/gerrit/httpd/raw/WarGwtUiServlet.java index ff279659b9..5fe7054e87 100644 --- a/java/com/google/gerrit/httpd/raw/WarGwtUiServlet.java +++ b/java/com/google/gerrit/httpd/raw/WarGwtUiServlet.java @@ -15,7 +15,7 @@ package com.google.gerrit.httpd.raw; import com.google.common.cache.Cache; -import com.google.gerrit.common.TimeUtil; +import com.google.gerrit.server.util.time.TimeUtil; import java.nio.file.FileSystem; import java.nio.file.Path; import java.nio.file.attribute.FileTime; diff --git a/java/com/google/gerrit/httpd/restapi/RestApiServlet.java b/java/com/google/gerrit/httpd/restapi/RestApiServlet.java index 524ec9b5e8..6b5fce173b 100644 --- a/java/com/google/gerrit/httpd/restapi/RestApiServlet.java +++ b/java/com/google/gerrit/httpd/restapi/RestApiServlet.java @@ -67,7 +67,6 @@ import com.google.common.math.IntMath; import com.google.common.net.HttpHeaders; import com.google.gerrit.common.Nullable; import com.google.gerrit.common.RawInputUtil; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.extensions.registration.DynamicItem; import com.google.gerrit.extensions.registration.DynamicMap; import com.google.gerrit.extensions.registration.PluginName; @@ -116,6 +115,7 @@ import com.google.gerrit.server.permissions.GlobalPermission; import com.google.gerrit.server.permissions.PermissionBackend; import com.google.gerrit.server.permissions.PermissionBackendException; import com.google.gerrit.server.update.UpdateException; +import com.google.gerrit.server.util.time.TimeUtil; import com.google.gerrit.util.http.CacheHeaders; import com.google.gerrit.util.http.RequestUtil; import com.google.gson.ExclusionStrategy; diff --git a/java/com/google/gerrit/httpd/rpc/GerritJsonServlet.java b/java/com/google/gerrit/httpd/rpc/GerritJsonServlet.java index f5d2216f57..16e82e921c 100644 --- a/java/com/google/gerrit/httpd/rpc/GerritJsonServlet.java +++ b/java/com/google/gerrit/httpd/rpc/GerritJsonServlet.java @@ -17,7 +17,6 @@ package com.google.gerrit.httpd.rpc; import com.google.common.collect.ListMultimap; import com.google.common.collect.MultimapBuilder; import com.google.common.flogger.FluentLogger; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.common.audit.Audit; import com.google.gerrit.common.auth.SignInRequired; import com.google.gerrit.common.errors.NotSignedInException; @@ -27,6 +26,7 @@ import com.google.gerrit.server.AccessPath; import com.google.gerrit.server.CurrentUser; import com.google.gerrit.server.audit.AuditService; import com.google.gerrit.server.audit.RpcAuditEvent; +import com.google.gerrit.server.util.time.TimeUtil; import com.google.gson.GsonBuilder; import com.google.gwtjsonrpc.common.RemoteJsonService; import com.google.gwtjsonrpc.server.ActiveCall; diff --git a/java/com/google/gerrit/httpd/rpc/project/ReviewProjectAccess.java b/java/com/google/gerrit/httpd/rpc/project/ReviewProjectAccess.java index aee0330206..8b2090d104 100644 --- a/java/com/google/gerrit/httpd/rpc/project/ReviewProjectAccess.java +++ b/java/com/google/gerrit/httpd/rpc/project/ReviewProjectAccess.java @@ -16,7 +16,6 @@ package com.google.gerrit.httpd.rpc.project; import com.google.common.base.Throwables; import com.google.gerrit.common.Nullable; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.common.data.AccessSection; import com.google.gerrit.common.data.GlobalCapability; import com.google.gerrit.common.data.PermissionRule; @@ -49,6 +48,7 @@ import com.google.gerrit.server.restapi.change.PostReviewers; import com.google.gerrit.server.restapi.project.SetParent; import com.google.gerrit.server.update.BatchUpdate; import com.google.gerrit.server.update.UpdateException; +import com.google.gerrit.server.util.time.TimeUtil; import com.google.gwtorm.server.OrmException; import com.google.inject.Inject; import com.google.inject.Provider; diff --git a/java/com/google/gerrit/pgm/BUILD b/java/com/google/gerrit/pgm/BUILD index ba27991de7..b34aec0329 100644 --- a/java/com/google/gerrit/pgm/BUILD +++ b/java/com/google/gerrit/pgm/BUILD @@ -43,6 +43,7 @@ java_library( "//java/com/google/gerrit/server/ioutil", "//java/com/google/gerrit/server/restapi", "//java/com/google/gerrit/server/schema", + "//java/com/google/gerrit/server/util/time", "//java/com/google/gerrit/sshd", "//java/com/google/gerrit/util/http", "//lib:args4j", diff --git a/java/com/google/gerrit/pgm/http/jetty/BUILD b/java/com/google/gerrit/pgm/http/jetty/BUILD index b1da011079..a6a13dc74c 100644 --- a/java/com/google/gerrit/pgm/http/jetty/BUILD +++ b/java/com/google/gerrit/pgm/http/jetty/BUILD @@ -9,6 +9,7 @@ java_library( "//java/com/google/gerrit/launcher", "//java/com/google/gerrit/lifecycle", "//java/com/google/gerrit/server", + "//java/com/google/gerrit/server/util/time", "//java/com/google/gerrit/sshd", "//java/com/google/gerrit/util/http", "//lib:guava", diff --git a/java/com/google/gerrit/pgm/http/jetty/HttpLog.java b/java/com/google/gerrit/pgm/http/jetty/HttpLog.java index d7bc720aa3..1f639a78bc 100644 --- a/java/com/google/gerrit/pgm/http/jetty/HttpLog.java +++ b/java/com/google/gerrit/pgm/http/jetty/HttpLog.java @@ -20,10 +20,10 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Splitter; import com.google.common.base.Strings; import com.google.common.collect.ImmutableSet; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.extensions.restapi.Url; import com.google.gerrit.httpd.GetUserFilter; import com.google.gerrit.server.util.SystemLog; +import com.google.gerrit.server.util.time.TimeUtil; import com.google.inject.Inject; import java.util.Iterator; import org.apache.log4j.AsyncAppender; diff --git a/java/com/google/gerrit/pgm/init/BUILD b/java/com/google/gerrit/pgm/init/BUILD index 8a1c08b6aa..7e04e5a562 100644 --- a/java/com/google/gerrit/pgm/init/BUILD +++ b/java/com/google/gerrit/pgm/init/BUILD @@ -19,6 +19,7 @@ java_library( "//java/com/google/gerrit/server", "//java/com/google/gerrit/server/ioutil", "//java/com/google/gerrit/server/schema", + "//java/com/google/gerrit/server/util/time", "//lib:guava", "//lib:gwtjsonrpc", "//lib:gwtorm", diff --git a/java/com/google/gerrit/pgm/init/InitAdminUser.java b/java/com/google/gerrit/pgm/init/InitAdminUser.java index d0aed4606d..f12fa50507 100644 --- a/java/com/google/gerrit/pgm/init/InitAdminUser.java +++ b/java/com/google/gerrit/pgm/init/InitAdminUser.java @@ -17,7 +17,6 @@ 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.TimeUtil; import com.google.gerrit.common.data.GroupReference; import com.google.gerrit.common.errors.NoSuchGroupException; import com.google.gerrit.extensions.client.AuthType; @@ -37,6 +36,7 @@ import com.google.gerrit.server.index.account.AccountIndex; import com.google.gerrit.server.index.account.AccountIndexCollection; import com.google.gerrit.server.index.group.GroupIndex; import com.google.gerrit.server.index.group.GroupIndexCollection; +import com.google.gerrit.server.util.time.TimeUtil; import com.google.gwtorm.server.SchemaFactory; import com.google.inject.Inject; import java.io.IOException; diff --git a/java/com/google/gerrit/pgm/rules/PrologCompiler.java b/java/com/google/gerrit/pgm/rules/PrologCompiler.java index 4ad770189c..2663f42f51 100644 --- a/java/com/google/gerrit/pgm/rules/PrologCompiler.java +++ b/java/com/google/gerrit/pgm/rules/PrologCompiler.java @@ -14,11 +14,11 @@ package com.google.gerrit.pgm.rules; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.common.Version; import com.google.gerrit.reviewdb.client.RefNames; import com.google.gerrit.server.config.GerritServerConfig; import com.google.gerrit.server.config.SitePaths; +import com.google.gerrit.server.util.time.TimeUtil; import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; import com.googlecode.prolog_cafe.compiler.Compiler; diff --git a/java/com/google/gerrit/server/BUILD b/java/com/google/gerrit/server/BUILD index e5bc480c57..0d48bcad57 100644 --- a/java/com/google/gerrit/server/BUILD +++ b/java/com/google/gerrit/server/BUILD @@ -44,6 +44,7 @@ java_library( "//java/com/google/gerrit/server/ioutil", "//java/com/google/gerrit/server/logging", "//java/com/google/gerrit/server/util/git", + "//java/com/google/gerrit/server/util/time", "//java/com/google/gerrit/util/cli", "//java/com/google/gerrit/util/ssl", "//java/org/apache/commons/net", diff --git a/java/com/google/gerrit/server/account/AccountCacheImpl.java b/java/com/google/gerrit/server/account/AccountCacheImpl.java index 2cde94c6f9..b6ae21638b 100644 --- a/java/com/google/gerrit/server/account/AccountCacheImpl.java +++ b/java/com/google/gerrit/server/account/AccountCacheImpl.java @@ -21,13 +21,13 @@ import com.google.common.cache.LoadingCache; import com.google.common.collect.ImmutableMap; import com.google.common.flogger.FluentLogger; import com.google.gerrit.common.Nullable; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.server.FanOutExecutor; import com.google.gerrit.server.account.externalids.ExternalId; import com.google.gerrit.server.account.externalids.ExternalIds; import com.google.gerrit.server.cache.CacheModule; import com.google.gerrit.server.config.AllUsersName; +import com.google.gerrit.server.util.time.TimeUtil; import com.google.inject.Inject; import com.google.inject.Module; import com.google.inject.Singleton; diff --git a/java/com/google/gerrit/server/account/AccountConfig.java b/java/com/google/gerrit/server/account/AccountConfig.java index 3bdc71ae8c..5cd18e3650 100644 --- a/java/com/google/gerrit/server/account/AccountConfig.java +++ b/java/com/google/gerrit/server/account/AccountConfig.java @@ -21,7 +21,6 @@ import com.google.common.base.Strings; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.extensions.client.DiffPreferencesInfo; import com.google.gerrit.extensions.client.EditPreferencesInfo; import com.google.gerrit.extensions.client.GeneralPreferencesInfo; @@ -34,6 +33,7 @@ import com.google.gerrit.server.config.AllUsersName; import com.google.gerrit.server.git.ValidationError; import com.google.gerrit.server.git.meta.MetaDataUpdate; import com.google.gerrit.server.git.meta.VersionedMetaData; +import com.google.gerrit.server.util.time.TimeUtil; import com.google.gwtorm.server.OrmDuplicateKeyException; import java.io.IOException; import java.sql.Timestamp; diff --git a/java/com/google/gerrit/server/audit/AuditEvent.java b/java/com/google/gerrit/server/audit/AuditEvent.java index 4abdfd9bb6..ff4f72b893 100644 --- a/java/com/google/gerrit/server/audit/AuditEvent.java +++ b/java/com/google/gerrit/server/audit/AuditEvent.java @@ -19,8 +19,8 @@ import com.google.common.base.MoreObjects; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableListMultimap; import com.google.common.collect.ListMultimap; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.server.CurrentUser; +import com.google.gerrit.server.util.time.TimeUtil; public class AuditEvent { diff --git a/java/com/google/gerrit/server/audit/BUILD b/java/com/google/gerrit/server/audit/BUILD index d85668e3be..69827664ba 100644 --- a/java/com/google/gerrit/server/audit/BUILD +++ b/java/com/google/gerrit/server/audit/BUILD @@ -7,8 +7,6 @@ java_library( resources = ["//resources/com/google/gerrit/server"], visibility = ["//visibility:public"], deps = [ - "//java/com/google/gerrit/common:annotations", - "//java/com/google/gerrit/common:server", "//java/com/google/gerrit/extensions:api", "//java/com/google/gerrit/index", "//java/com/google/gerrit/index:query_exception", @@ -19,6 +17,7 @@ java_library( "//java/com/google/gerrit/reviewdb:server", "//java/com/google/gerrit/server", "//java/com/google/gerrit/server/ioutil", + "//java/com/google/gerrit/server/util/time", "//java/com/google/gerrit/util/cli", "//java/com/google/gerrit/util/ssl", "//java/org/apache/commons/net", diff --git a/java/com/google/gerrit/server/cache/h2/BUILD b/java/com/google/gerrit/server/cache/h2/BUILD index f6418e388c..f85b498ce1 100644 --- a/java/com/google/gerrit/server/cache/h2/BUILD +++ b/java/com/google/gerrit/server/cache/h2/BUILD @@ -10,6 +10,7 @@ java_library( "//java/com/google/gerrit/server", "//java/com/google/gerrit/server/cache/serialize", "//java/com/google/gerrit/server/logging", + "//java/com/google/gerrit/server/util/time", "//lib:guava", "//lib:h2", "//lib/flogger:api", diff --git a/java/com/google/gerrit/server/cache/h2/H2CacheImpl.java b/java/com/google/gerrit/server/cache/h2/H2CacheImpl.java index df1c7ebb22..a5388972e6 100644 --- a/java/com/google/gerrit/server/cache/h2/H2CacheImpl.java +++ b/java/com/google/gerrit/server/cache/h2/H2CacheImpl.java @@ -24,9 +24,9 @@ import com.google.common.collect.ImmutableSet; import com.google.common.flogger.FluentLogger; import com.google.common.hash.BloomFilter; import com.google.gerrit.common.Nullable; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.server.cache.PersistentCache; import com.google.gerrit.server.cache.serialize.CacheSerializer; +import com.google.gerrit.server.util.time.TimeUtil; import com.google.inject.TypeLiteral; import java.io.IOException; import java.io.InvalidClassException; diff --git a/java/com/google/gerrit/server/change/BatchAbandon.java b/java/com/google/gerrit/server/change/BatchAbandon.java index 0ecfcb0d4c..a8e2407e84 100644 --- a/java/com/google/gerrit/server/change/BatchAbandon.java +++ b/java/com/google/gerrit/server/change/BatchAbandon.java @@ -16,7 +16,6 @@ package com.google.gerrit.server.change; import com.google.common.collect.ImmutableListMultimap; import com.google.common.collect.ListMultimap; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.extensions.api.changes.NotifyHandling; import com.google.gerrit.extensions.api.changes.RecipientType; import com.google.gerrit.extensions.restapi.ResourceConflictException; @@ -29,6 +28,7 @@ import com.google.gerrit.server.account.AccountState; import com.google.gerrit.server.query.change.ChangeData; import com.google.gerrit.server.update.BatchUpdate; import com.google.gerrit.server.update.UpdateException; +import com.google.gerrit.server.util.time.TimeUtil; import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; diff --git a/java/com/google/gerrit/server/change/ConsistencyChecker.java b/java/com/google/gerrit/server/change/ConsistencyChecker.java index 41757e67c5..0bda066123 100644 --- a/java/com/google/gerrit/server/change/ConsistencyChecker.java +++ b/java/com/google/gerrit/server/change/ConsistencyChecker.java @@ -29,7 +29,6 @@ import com.google.common.collect.SetMultimap; import com.google.common.flogger.FluentLogger; import com.google.gerrit.common.FooterConstants; import com.google.gerrit.common.Nullable; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.extensions.api.changes.FixInput; import com.google.gerrit.extensions.api.changes.NotifyHandling; import com.google.gerrit.extensions.common.ProblemInfo; @@ -58,6 +57,7 @@ import com.google.gerrit.server.update.ChangeContext; import com.google.gerrit.server.update.RepoContext; import com.google.gerrit.server.update.RetryHelper; import com.google.gerrit.server.update.UpdateException; +import com.google.gerrit.server.util.time.TimeUtil; import com.google.gwtorm.server.OrmException; import com.google.inject.Inject; import com.google.inject.Provider; diff --git a/java/com/google/gerrit/server/change/FileContentUtil.java b/java/com/google/gerrit/server/change/FileContentUtil.java index 00b7a88497..a806f94653 100644 --- a/java/com/google/gerrit/server/change/FileContentUtil.java +++ b/java/com/google/gerrit/server/change/FileContentUtil.java @@ -20,7 +20,6 @@ import com.google.common.base.Strings; import com.google.common.hash.Hasher; import com.google.common.hash.Hashing; import com.google.gerrit.common.Nullable; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.common.data.PatchScript.FileMode; import com.google.gerrit.extensions.restapi.BadRequestException; import com.google.gerrit.extensions.restapi.BinaryResult; @@ -29,6 +28,7 @@ import com.google.gerrit.reviewdb.client.Patch; import com.google.gerrit.server.git.GitRepositoryManager; import com.google.gerrit.server.mime.FileTypeRegistry; import com.google.gerrit.server.project.ProjectState; +import com.google.gerrit.server.util.time.TimeUtil; import com.google.inject.Inject; import com.google.inject.Singleton; import eu.medsea.mimeutil.MimeType; diff --git a/java/com/google/gerrit/server/edit/ChangeEditModifier.java b/java/com/google/gerrit/server/edit/ChangeEditModifier.java index a8c463d4d2..ce359a9b14 100644 --- a/java/com/google/gerrit/server/edit/ChangeEditModifier.java +++ b/java/com/google/gerrit/server/edit/ChangeEditModifier.java @@ -15,7 +15,6 @@ package com.google.gerrit.server.edit; import com.google.common.collect.ImmutableList; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.extensions.restapi.AuthException; import com.google.gerrit.extensions.restapi.BadRequestException; import com.google.gerrit.extensions.restapi.MergeConflictException; @@ -43,6 +42,7 @@ import com.google.gerrit.server.permissions.PermissionBackendException; import com.google.gerrit.server.project.InvalidChangeOperationException; import com.google.gerrit.server.project.ProjectCache; import com.google.gerrit.server.util.CommitMessageUtil; +import com.google.gerrit.server.util.time.TimeUtil; import com.google.gwtorm.server.OrmException; import com.google.inject.Inject; import com.google.inject.Provider; diff --git a/java/com/google/gerrit/server/edit/ChangeEditUtil.java b/java/com/google/gerrit/server/edit/ChangeEditUtil.java index 24ee881d52..d5add76be1 100644 --- a/java/com/google/gerrit/server/edit/ChangeEditUtil.java +++ b/java/com/google/gerrit/server/edit/ChangeEditUtil.java @@ -17,7 +17,6 @@ package com.google.gerrit.server.edit; import static com.google.common.base.Preconditions.checkArgument; import com.google.common.collect.ListMultimap; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.extensions.api.changes.NotifyHandling; import com.google.gerrit.extensions.api.changes.RecipientType; import com.google.gerrit.extensions.client.ChangeKind; @@ -42,6 +41,7 @@ import com.google.gerrit.server.update.BatchUpdate; import com.google.gerrit.server.update.BatchUpdateOp; import com.google.gerrit.server.update.RepoContext; import com.google.gerrit.server.update.UpdateException; +import com.google.gerrit.server.util.time.TimeUtil; import com.google.gwtorm.server.OrmException; import com.google.inject.Inject; import com.google.inject.Provider; diff --git a/java/com/google/gerrit/server/events/Event.java b/java/com/google/gerrit/server/events/Event.java index 20fbe2fc1a..c07987a29e 100644 --- a/java/com/google/gerrit/server/events/Event.java +++ b/java/com/google/gerrit/server/events/Event.java @@ -14,7 +14,7 @@ package com.google.gerrit.server.events; -import com.google.gerrit.common.TimeUtil; +import com.google.gerrit.server.util.time.TimeUtil; public abstract class Event { public final String type; diff --git a/java/com/google/gerrit/server/git/receive/BUILD b/java/com/google/gerrit/server/git/receive/BUILD index f1c604b866..0724215bd1 100644 --- a/java/com/google/gerrit/server/git/receive/BUILD +++ b/java/com/google/gerrit/server/git/receive/BUILD @@ -9,6 +9,7 @@ java_library( "//java/com/google/gerrit/reviewdb:server", "//java/com/google/gerrit/server", "//java/com/google/gerrit/server/logging", + "//java/com/google/gerrit/server/util/time", "//java/com/google/gerrit/util/cli", "//lib:args4j", "//lib:guava", diff --git a/java/com/google/gerrit/server/git/receive/ReceiveCommits.java b/java/com/google/gerrit/server/git/receive/ReceiveCommits.java index 4b475f9b5b..ee751d7541 100644 --- a/java/com/google/gerrit/server/git/receive/ReceiveCommits.java +++ b/java/com/google/gerrit/server/git/receive/ReceiveCommits.java @@ -60,7 +60,6 @@ import com.google.common.collect.SortedSetMultimap; import com.google.common.flogger.FluentLogger; import com.google.gerrit.common.FooterConstants; import com.google.gerrit.common.Nullable; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.common.data.LabelType; import com.google.gerrit.common.data.LabelTypes; import com.google.gerrit.extensions.api.changes.HashtagsInput; @@ -155,6 +154,7 @@ import com.google.gerrit.server.update.UpdateException; import com.google.gerrit.server.util.LabelVote; import com.google.gerrit.server.util.MagicBranch; import com.google.gerrit.server.util.RequestScopePropagator; +import com.google.gerrit.server.util.time.TimeUtil; import com.google.gerrit.util.cli.CmdLineParser; import com.google.gwtorm.server.OrmException; import com.google.inject.Inject; diff --git a/java/com/google/gerrit/server/group/db/GroupConfig.java b/java/com/google/gerrit/server/group/db/GroupConfig.java index 2fae4cce8a..193a67f3bb 100644 --- a/java/com/google/gerrit/server/group/db/GroupConfig.java +++ b/java/com/google/gerrit/server/group/db/GroupConfig.java @@ -24,7 +24,6 @@ import com.google.common.base.Splitter; import com.google.common.base.Strings; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Streams; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.reviewdb.client.AccountGroup; import com.google.gerrit.reviewdb.client.Project; @@ -32,6 +31,7 @@ import com.google.gerrit.reviewdb.client.RefNames; import com.google.gerrit.server.git.meta.MetaDataUpdate; import com.google.gerrit.server.git.meta.VersionedMetaData; import com.google.gerrit.server.group.InternalGroup; +import com.google.gerrit.server.util.time.TimeUtil; import com.google.gwtorm.server.OrmDuplicateKeyException; import java.io.IOException; import java.sql.Timestamp; diff --git a/java/com/google/gerrit/server/group/db/GroupsUpdate.java b/java/com/google/gerrit/server/group/db/GroupsUpdate.java index 314825bdc9..6477f31702 100644 --- a/java/com/google/gerrit/server/group/db/GroupsUpdate.java +++ b/java/com/google/gerrit/server/group/db/GroupsUpdate.java @@ -20,7 +20,6 @@ import com.google.common.base.Throwables; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; import com.google.gerrit.common.Nullable; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.common.errors.NoSuchGroupException; import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.reviewdb.client.AccountGroup; @@ -42,6 +41,7 @@ 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; import com.google.inject.Inject; import com.google.inject.Provider; diff --git a/java/com/google/gerrit/server/logging/BUILD b/java/com/google/gerrit/server/logging/BUILD index d3211f0bbf..f983b245be 100644 --- a/java/com/google/gerrit/server/logging/BUILD +++ b/java/com/google/gerrit/server/logging/BUILD @@ -6,7 +6,7 @@ java_library( visibility = ["//visibility:public"], deps = [ "//java/com/google/gerrit/common:annotations", - "//java/com/google/gerrit/common:server", + "//java/com/google/gerrit/server/util/time", "//lib:guava", "//lib/flogger:api", ], diff --git a/java/com/google/gerrit/server/logging/RequestId.java b/java/com/google/gerrit/server/logging/RequestId.java index b0a8ad924b..ceb5da0e95 100644 --- a/java/com/google/gerrit/server/logging/RequestId.java +++ b/java/com/google/gerrit/server/logging/RequestId.java @@ -18,7 +18,7 @@ import com.google.common.base.Enums; import com.google.common.hash.Hasher; import com.google.common.hash.Hashing; import com.google.gerrit.common.Nullable; -import com.google.gerrit.common.TimeUtil; +import com.google.gerrit.server.util.time.TimeUtil; import java.net.InetAddress; import java.net.UnknownHostException; diff --git a/java/com/google/gerrit/server/mail/receive/MailProcessor.java b/java/com/google/gerrit/server/mail/receive/MailProcessor.java index 707056cbcb..ec0c1f2e23 100644 --- a/java/com/google/gerrit/server/mail/receive/MailProcessor.java +++ b/java/com/google/gerrit/server/mail/receive/MailProcessor.java @@ -20,7 +20,6 @@ import com.google.common.base.Strings; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.ImmutableList; import com.google.common.flogger.FluentLogger; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.extensions.api.changes.NotifyHandling; import com.google.gerrit.extensions.client.Side; import com.google.gerrit.extensions.registration.DynamicMap; @@ -64,6 +63,7 @@ import com.google.gerrit.server.update.RetryHelper; import com.google.gerrit.server.update.UpdateException; import com.google.gerrit.server.util.ManualRequestContext; import com.google.gerrit.server.util.OneOffRequestContext; +import com.google.gerrit.server.util.time.TimeUtil; import com.google.gwtorm.server.OrmException; import com.google.inject.Inject; import com.google.inject.Provider; diff --git a/java/com/google/gerrit/server/mail/send/SmtpEmailSender.java b/java/com/google/gerrit/server/mail/send/SmtpEmailSender.java index 2262b5c385..8615c04a02 100644 --- a/java/com/google/gerrit/server/mail/send/SmtpEmailSender.java +++ b/java/com/google/gerrit/server/mail/send/SmtpEmailSender.java @@ -19,7 +19,6 @@ import static java.nio.charset.StandardCharsets.UTF_8; import com.google.common.io.BaseEncoding; import com.google.common.primitives.Ints; import com.google.gerrit.common.Nullable; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.common.Version; import com.google.gerrit.common.errors.EmailException; import com.google.gerrit.mail.Address; @@ -27,6 +26,7 @@ import com.google.gerrit.mail.EmailHeader; import com.google.gerrit.server.config.ConfigUtil; import com.google.gerrit.server.config.GerritServerConfig; import com.google.gerrit.server.mail.Encryption; +import com.google.gerrit.server.util.time.TimeUtil; import com.google.inject.AbstractModule; import com.google.inject.Inject; import com.google.inject.Singleton; diff --git a/java/com/google/gerrit/server/notedb/ChangeBundle.java b/java/com/google/gerrit/server/notedb/ChangeBundle.java index 0ebee1a18e..d534ff2f0f 100644 --- a/java/com/google/gerrit/server/notedb/ChangeBundle.java +++ b/java/com/google/gerrit/server/notedb/ChangeBundle.java @@ -19,11 +19,11 @@ import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.collect.ImmutableList.toImmutableList; import static com.google.common.collect.ImmutableSortedMap.toImmutableSortedMap; -import static com.google.gerrit.common.TimeUtil.truncateToSecond; import static com.google.gerrit.reviewdb.server.ReviewDbUtil.checkColumns; import static com.google.gerrit.reviewdb.server.ReviewDbUtil.intKeyOrdering; import static com.google.gerrit.server.notedb.ChangeBundle.Source.NOTE_DB; import static com.google.gerrit.server.notedb.ChangeBundle.Source.REVIEW_DB; +import static com.google.gerrit.server.util.time.TimeUtil.truncateToSecond; import static java.util.Comparator.comparing; import static java.util.Comparator.naturalOrder; import static java.util.Comparator.nullsFirst; diff --git a/java/com/google/gerrit/server/notedb/NoteDbChangeState.java b/java/com/google/gerrit/server/notedb/NoteDbChangeState.java index 1c11e8b0fb..a69128e83c 100644 --- a/java/com/google/gerrit/server/notedb/NoteDbChangeState.java +++ b/java/com/google/gerrit/server/notedb/NoteDbChangeState.java @@ -30,11 +30,11 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; import com.google.common.primitives.Longs; import com.google.gerrit.common.Nullable; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.reviewdb.client.Change; import com.google.gerrit.reviewdb.server.ReviewDbUtil; import com.google.gerrit.server.git.RefCache; +import com.google.gerrit.server.util.time.TimeUtil; import com.google.gwtorm.server.OrmRuntimeException; import java.io.IOException; import java.sql.Timestamp; diff --git a/java/com/google/gerrit/server/notedb/PrimaryStorageMigrator.java b/java/com/google/gerrit/server/notedb/PrimaryStorageMigrator.java index 9dd3933802..7b427b478f 100644 --- a/java/com/google/gerrit/server/notedb/PrimaryStorageMigrator.java +++ b/java/com/google/gerrit/server/notedb/PrimaryStorageMigrator.java @@ -29,7 +29,6 @@ import com.google.common.base.Stopwatch; import com.google.common.collect.ImmutableMap; import com.google.common.flogger.FluentLogger; import com.google.gerrit.common.Nullable; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.extensions.restapi.RestApiException; import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.reviewdb.client.Change; @@ -53,6 +52,7 @@ import com.google.gerrit.server.update.BatchUpdateOp; import com.google.gerrit.server.update.ChangeContext; import com.google.gerrit.server.update.RetryHelper; import com.google.gerrit.server.update.UpdateException; +import com.google.gerrit.server.util.time.TimeUtil; import com.google.gwtorm.server.AtomicUpdate; import com.google.gwtorm.server.OrmException; import com.google.gwtorm.server.OrmRuntimeException; diff --git a/java/com/google/gerrit/server/plugins/PluginCleanerTask.java b/java/com/google/gerrit/server/plugins/PluginCleanerTask.java index 11a4eab34b..6919bbc3bb 100644 --- a/java/com/google/gerrit/server/plugins/PluginCleanerTask.java +++ b/java/com/google/gerrit/server/plugins/PluginCleanerTask.java @@ -15,8 +15,8 @@ package com.google.gerrit.server.plugins; import com.google.common.flogger.FluentLogger; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.server.git.WorkQueue; +import com.google.gerrit.server.util.time.TimeUtil; import com.google.inject.Inject; import com.google.inject.Singleton; import java.util.concurrent.Future; diff --git a/java/com/google/gerrit/server/query/change/AgePredicate.java b/java/com/google/gerrit/server/query/change/AgePredicate.java index 631066575f..29f1b8af70 100644 --- a/java/com/google/gerrit/server/query/change/AgePredicate.java +++ b/java/com/google/gerrit/server/query/change/AgePredicate.java @@ -17,10 +17,10 @@ package com.google.gerrit.server.query.change; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static java.util.concurrent.TimeUnit.SECONDS; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.reviewdb.client.Change; import com.google.gerrit.server.config.ConfigUtil; import com.google.gerrit.server.index.change.ChangeField; +import com.google.gerrit.server.util.time.TimeUtil; import com.google.gwtorm.server.OrmException; import java.sql.Timestamp; diff --git a/java/com/google/gerrit/server/query/change/OutputStreamQuery.java b/java/com/google/gerrit/server/query/change/OutputStreamQuery.java index dbbf367ade..1287970a42 100644 --- a/java/com/google/gerrit/server/query/change/OutputStreamQuery.java +++ b/java/com/google/gerrit/server/query/change/OutputStreamQuery.java @@ -18,7 +18,6 @@ import static com.google.common.base.Preconditions.checkState; import static java.nio.charset.StandardCharsets.UTF_8; import com.google.common.flogger.FluentLogger; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.common.data.LabelTypes; import com.google.gerrit.index.query.QueryParseException; import com.google.gerrit.index.query.QueryResult; @@ -33,6 +32,7 @@ import com.google.gerrit.server.events.EventFactory; import com.google.gerrit.server.git.GitRepositoryManager; import com.google.gerrit.server.project.SubmitRuleEvaluator; import com.google.gerrit.server.project.SubmitRuleOptions; +import com.google.gerrit.server.util.time.TimeUtil; import com.google.gson.Gson; import com.google.gwtorm.server.OrmException; import com.google.inject.Inject; diff --git a/java/com/google/gerrit/server/restapi/BUILD b/java/com/google/gerrit/server/restapi/BUILD index 251c7c13c8..5e6dddf14c 100644 --- a/java/com/google/gerrit/server/restapi/BUILD +++ b/java/com/google/gerrit/server/restapi/BUILD @@ -18,6 +18,7 @@ java_library( "//java/com/google/gerrit/reviewdb:server", "//java/com/google/gerrit/server", "//java/com/google/gerrit/server/ioutil", + "//java/com/google/gerrit/server/util/time", "//java/com/google/gerrit/util/cli", "//java/org/eclipse/jgit:server", "//lib:args4j", diff --git a/java/com/google/gerrit/server/restapi/account/DeleteDraftComments.java b/java/com/google/gerrit/server/restapi/account/DeleteDraftComments.java index 26d6cf4446..108ee0e04f 100644 --- a/java/com/google/gerrit/server/restapi/account/DeleteDraftComments.java +++ b/java/com/google/gerrit/server/restapi/account/DeleteDraftComments.java @@ -21,7 +21,6 @@ import com.google.common.base.CharMatcher; import com.google.common.base.Strings; import com.google.common.collect.ImmutableList; import com.google.gerrit.common.Nullable; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.extensions.api.accounts.DeleteDraftCommentsInput; import com.google.gerrit.extensions.api.accounts.DeletedDraftCommentInfo; import com.google.gerrit.extensions.client.ListChangesOption; @@ -58,6 +57,7 @@ import com.google.gerrit.server.update.BatchUpdateListener; import com.google.gerrit.server.update.BatchUpdateOp; import com.google.gerrit.server.update.ChangeContext; import com.google.gerrit.server.update.UpdateException; +import com.google.gerrit.server.util.time.TimeUtil; import com.google.gwtorm.server.OrmException; import com.google.inject.Inject; import com.google.inject.Provider; diff --git a/java/com/google/gerrit/server/restapi/change/Abandon.java b/java/com/google/gerrit/server/restapi/change/Abandon.java index c739e545ad..ccce99879e 100644 --- a/java/com/google/gerrit/server/restapi/change/Abandon.java +++ b/java/com/google/gerrit/server/restapi/change/Abandon.java @@ -17,7 +17,6 @@ package com.google.gerrit.server.restapi.change; import com.google.common.collect.ImmutableListMultimap; import com.google.common.collect.ListMultimap; import com.google.common.flogger.FluentLogger; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.extensions.api.changes.AbandonInput; import com.google.gerrit.extensions.api.changes.NotifyHandling; import com.google.gerrit.extensions.api.changes.RecipientType; @@ -41,6 +40,7 @@ import com.google.gerrit.server.update.BatchUpdate; import com.google.gerrit.server.update.RetryHelper; import com.google.gerrit.server.update.RetryingRestModifyView; import com.google.gerrit.server.update.UpdateException; +import com.google.gerrit.server.util.time.TimeUtil; import com.google.gwtorm.server.OrmException; import com.google.inject.Inject; import com.google.inject.Provider; diff --git a/java/com/google/gerrit/server/restapi/change/CherryPickChange.java b/java/com/google/gerrit/server/restapi/change/CherryPickChange.java index b777461d61..0de8405388 100644 --- a/java/com/google/gerrit/server/restapi/change/CherryPickChange.java +++ b/java/com/google/gerrit/server/restapi/change/CherryPickChange.java @@ -17,7 +17,6 @@ package com.google.gerrit.server.restapi.change; import com.google.common.base.Strings; import com.google.gerrit.common.FooterConstants; import com.google.gerrit.common.Nullable; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.extensions.api.changes.CherryPickInput; import com.google.gerrit.extensions.restapi.BadRequestException; import com.google.gerrit.extensions.restapi.MergeConflictException; @@ -60,6 +59,7 @@ import com.google.gerrit.server.update.BatchUpdate; import com.google.gerrit.server.update.BatchUpdateOp; import com.google.gerrit.server.update.ChangeContext; import com.google.gerrit.server.update.UpdateException; +import com.google.gerrit.server.util.time.TimeUtil; import com.google.gwtorm.server.OrmException; import com.google.inject.Inject; import com.google.inject.Provider; diff --git a/java/com/google/gerrit/server/restapi/change/CreateChange.java b/java/com/google/gerrit/server/restapi/change/CreateChange.java index b48e0404b6..a99f7db7c1 100644 --- a/java/com/google/gerrit/server/restapi/change/CreateChange.java +++ b/java/com/google/gerrit/server/restapi/change/CreateChange.java @@ -20,7 +20,6 @@ import com.google.common.base.Joiner; import com.google.common.base.MoreObjects; import com.google.common.base.Strings; import com.google.common.collect.Iterables; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.extensions.client.ChangeStatus; import com.google.gerrit.extensions.client.GeneralPreferencesInfo; import com.google.gerrit.extensions.client.SubmitType; @@ -71,6 +70,7 @@ import com.google.gerrit.server.update.BatchUpdate; import com.google.gerrit.server.update.RetryHelper; import com.google.gerrit.server.update.RetryingRestCollectionModifyView; import com.google.gerrit.server.update.UpdateException; +import com.google.gerrit.server.util.time.TimeUtil; import com.google.gwtorm.server.OrmException; import com.google.inject.Inject; import com.google.inject.Provider; diff --git a/java/com/google/gerrit/server/restapi/change/CreateDraftComment.java b/java/com/google/gerrit/server/restapi/change/CreateDraftComment.java index c22fb1eed6..0e93c5578d 100644 --- a/java/com/google/gerrit/server/restapi/change/CreateDraftComment.java +++ b/java/com/google/gerrit/server/restapi/change/CreateDraftComment.java @@ -17,7 +17,6 @@ package com.google.gerrit.server.restapi.change; import static com.google.gerrit.server.CommentsUtil.setCommentRevId; import com.google.common.base.Strings; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.extensions.api.changes.DraftInput; import com.google.gerrit.extensions.common.CommentInfo; import com.google.gerrit.extensions.restapi.BadRequestException; @@ -42,6 +41,7 @@ import com.google.gerrit.server.update.ChangeContext; import com.google.gerrit.server.update.RetryHelper; import com.google.gerrit.server.update.RetryingRestModifyView; import com.google.gerrit.server.update.UpdateException; +import com.google.gerrit.server.util.time.TimeUtil; import com.google.gwtorm.server.OrmException; import com.google.inject.Inject; import com.google.inject.Provider; diff --git a/java/com/google/gerrit/server/restapi/change/CreateMergePatchSet.java b/java/com/google/gerrit/server/restapi/change/CreateMergePatchSet.java index a5698b6d29..178206c3e1 100644 --- a/java/com/google/gerrit/server/restapi/change/CreateMergePatchSet.java +++ b/java/com/google/gerrit/server/restapi/change/CreateMergePatchSet.java @@ -17,7 +17,6 @@ package com.google.gerrit.server.restapi.change; import com.google.common.base.MoreObjects; import com.google.common.base.Strings; import com.google.common.collect.Iterables; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.extensions.api.changes.NotifyHandling; import com.google.gerrit.extensions.client.ListChangesOption; import com.google.gerrit.extensions.common.ChangeInfo; @@ -58,6 +57,7 @@ import com.google.gerrit.server.update.BatchUpdate; import com.google.gerrit.server.update.RetryHelper; import com.google.gerrit.server.update.RetryingRestModifyView; import com.google.gerrit.server.update.UpdateException; +import com.google.gerrit.server.util.time.TimeUtil; import com.google.gwtorm.server.OrmException; import com.google.inject.Inject; import com.google.inject.Provider; diff --git a/java/com/google/gerrit/server/restapi/change/DeleteAssignee.java b/java/com/google/gerrit/server/restapi/change/DeleteAssignee.java index eb1e10e016..7d68022d49 100644 --- a/java/com/google/gerrit/server/restapi/change/DeleteAssignee.java +++ b/java/com/google/gerrit/server/restapi/change/DeleteAssignee.java @@ -14,7 +14,6 @@ package com.google.gerrit.server.restapi.change; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.extensions.common.AccountInfo; import com.google.gerrit.extensions.common.Input; import com.google.gerrit.extensions.restapi.Response; @@ -39,6 +38,7 @@ import com.google.gerrit.server.update.Context; import com.google.gerrit.server.update.RetryHelper; import com.google.gerrit.server.update.RetryingRestModifyView; import com.google.gerrit.server.update.UpdateException; +import com.google.gerrit.server.util.time.TimeUtil; import com.google.gwtorm.server.OrmException; import com.google.inject.Inject; import com.google.inject.Provider; diff --git a/java/com/google/gerrit/server/restapi/change/DeleteChange.java b/java/com/google/gerrit/server/restapi/change/DeleteChange.java index 4bd10ed767..b89ef39457 100644 --- a/java/com/google/gerrit/server/restapi/change/DeleteChange.java +++ b/java/com/google/gerrit/server/restapi/change/DeleteChange.java @@ -16,7 +16,6 @@ package com.google.gerrit.server.restapi.change; import static com.google.gerrit.extensions.conditions.BooleanCondition.and; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.extensions.common.Input; import com.google.gerrit.extensions.restapi.MethodNotAllowedException; import com.google.gerrit.extensions.restapi.Response; @@ -33,6 +32,7 @@ import com.google.gerrit.server.update.Order; import com.google.gerrit.server.update.RetryHelper; import com.google.gerrit.server.update.RetryingRestModifyView; import com.google.gerrit.server.update.UpdateException; +import com.google.gerrit.server.util.time.TimeUtil; import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; diff --git a/java/com/google/gerrit/server/restapi/change/DeleteChangeMessage.java b/java/com/google/gerrit/server/restapi/change/DeleteChangeMessage.java index 67c54c2d64..e2e892d428 100644 --- a/java/com/google/gerrit/server/restapi/change/DeleteChangeMessage.java +++ b/java/com/google/gerrit/server/restapi/change/DeleteChangeMessage.java @@ -20,7 +20,6 @@ import static com.google.gerrit.server.ChangeMessagesUtil.createChangeMessageInf import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Strings; import com.google.gerrit.common.Nullable; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.extensions.api.changes.DeleteChangeMessageInput; import com.google.gerrit.extensions.common.ChangeMessageInfo; import com.google.gerrit.extensions.common.Input; @@ -44,6 +43,7 @@ import com.google.gerrit.server.update.ChangeContext; import com.google.gerrit.server.update.RetryHelper; import com.google.gerrit.server.update.RetryingRestModifyView; import com.google.gerrit.server.update.UpdateException; +import com.google.gerrit.server.util.time.TimeUtil; import com.google.gwtorm.server.OrmException; import com.google.inject.Inject; import com.google.inject.Provider; diff --git a/java/com/google/gerrit/server/restapi/change/DeleteComment.java b/java/com/google/gerrit/server/restapi/change/DeleteComment.java index a8f39c09d6..2ddf359a66 100644 --- a/java/com/google/gerrit/server/restapi/change/DeleteComment.java +++ b/java/com/google/gerrit/server/restapi/change/DeleteComment.java @@ -15,7 +15,6 @@ package com.google.gerrit.server.restapi.change; import com.google.common.base.Strings; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.extensions.api.changes.DeleteCommentInput; import com.google.gerrit.extensions.common.CommentInfo; import com.google.gerrit.extensions.restapi.ResourceConflictException; @@ -37,6 +36,7 @@ import com.google.gerrit.server.update.ChangeContext; import com.google.gerrit.server.update.RetryHelper; import com.google.gerrit.server.update.RetryingRestModifyView; import com.google.gerrit.server.update.UpdateException; +import com.google.gerrit.server.util.time.TimeUtil; import com.google.gwtorm.server.OrmException; import com.google.inject.Inject; import com.google.inject.Provider; diff --git a/java/com/google/gerrit/server/restapi/change/DeleteDraftComment.java b/java/com/google/gerrit/server/restapi/change/DeleteDraftComment.java index e81f9f1787..f8e3add7db 100644 --- a/java/com/google/gerrit/server/restapi/change/DeleteDraftComment.java +++ b/java/com/google/gerrit/server/restapi/change/DeleteDraftComment.java @@ -16,7 +16,6 @@ package com.google.gerrit.server.restapi.change; import static com.google.gerrit.server.CommentsUtil.setCommentRevId; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.extensions.common.CommentInfo; import com.google.gerrit.extensions.common.Input; import com.google.gerrit.extensions.restapi.ResourceNotFoundException; @@ -36,6 +35,7 @@ import com.google.gerrit.server.update.ChangeContext; import com.google.gerrit.server.update.RetryHelper; import com.google.gerrit.server.update.RetryingRestModifyView; import com.google.gerrit.server.update.UpdateException; +import com.google.gerrit.server.util.time.TimeUtil; import com.google.gwtorm.server.OrmException; import com.google.inject.Inject; import com.google.inject.Provider; diff --git a/java/com/google/gerrit/server/restapi/change/DeletePrivate.java b/java/com/google/gerrit/server/restapi/change/DeletePrivate.java index 4ff1b66f8d..9b747e072d 100644 --- a/java/com/google/gerrit/server/restapi/change/DeletePrivate.java +++ b/java/com/google/gerrit/server/restapi/change/DeletePrivate.java @@ -16,7 +16,6 @@ package com.google.gerrit.server.restapi.change; import static com.google.gerrit.extensions.conditions.BooleanCondition.or; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.extensions.conditions.BooleanCondition; import com.google.gerrit.extensions.restapi.AuthException; import com.google.gerrit.extensions.restapi.ResourceConflictException; @@ -31,6 +30,7 @@ import com.google.gerrit.server.update.BatchUpdate; import com.google.gerrit.server.update.RetryHelper; import com.google.gerrit.server.update.RetryingRestModifyView; import com.google.gerrit.server.update.UpdateException; +import com.google.gerrit.server.util.time.TimeUtil; import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; diff --git a/java/com/google/gerrit/server/restapi/change/DeleteReviewer.java b/java/com/google/gerrit/server/restapi/change/DeleteReviewer.java index a92cf6cc66..245d1cdf58 100644 --- a/java/com/google/gerrit/server/restapi/change/DeleteReviewer.java +++ b/java/com/google/gerrit/server/restapi/change/DeleteReviewer.java @@ -14,7 +14,6 @@ package com.google.gerrit.server.restapi.change; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.extensions.api.changes.DeleteReviewerInput; import com.google.gerrit.extensions.restapi.Response; import com.google.gerrit.extensions.restapi.RestApiException; @@ -25,6 +24,7 @@ import com.google.gerrit.server.update.BatchUpdateOp; import com.google.gerrit.server.update.RetryHelper; import com.google.gerrit.server.update.RetryingRestModifyView; import com.google.gerrit.server.update.UpdateException; +import com.google.gerrit.server.util.time.TimeUtil; import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; diff --git a/java/com/google/gerrit/server/restapi/change/DeleteVote.java b/java/com/google/gerrit/server/restapi/change/DeleteVote.java index dc44e65e38..78e776e251 100644 --- a/java/com/google/gerrit/server/restapi/change/DeleteVote.java +++ b/java/com/google/gerrit/server/restapi/change/DeleteVote.java @@ -17,7 +17,6 @@ package com.google.gerrit.server.restapi.change; import static com.google.common.base.Preconditions.checkNotNull; import com.google.common.flogger.FluentLogger; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.common.data.LabelTypes; import com.google.gerrit.extensions.api.changes.DeleteVoteInput; import com.google.gerrit.extensions.api.changes.NotifyHandling; @@ -57,6 +56,7 @@ import com.google.gerrit.server.update.RetryHelper; import com.google.gerrit.server.update.RetryingRestModifyView; import com.google.gerrit.server.update.UpdateException; import com.google.gerrit.server.util.LabelVote; +import com.google.gerrit.server.util.time.TimeUtil; import com.google.gwtorm.server.OrmException; import com.google.inject.Inject; import com.google.inject.Provider; diff --git a/java/com/google/gerrit/server/restapi/change/Move.java b/java/com/google/gerrit/server/restapi/change/Move.java index 3833050185..013d3e9050 100644 --- a/java/com/google/gerrit/server/restapi/change/Move.java +++ b/java/com/google/gerrit/server/restapi/change/Move.java @@ -22,7 +22,6 @@ import static com.google.gerrit.server.query.change.ChangeData.asChanges; import com.google.common.base.Strings; import com.google.common.flogger.FluentLogger; import com.google.gerrit.common.Nullable; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.common.data.LabelType; import com.google.gerrit.extensions.api.changes.MoveInput; import com.google.gerrit.extensions.common.ChangeInfo; @@ -61,6 +60,7 @@ import com.google.gerrit.server.update.ChangeContext; import com.google.gerrit.server.update.RetryHelper; import com.google.gerrit.server.update.RetryingRestModifyView; import com.google.gerrit.server.update.UpdateException; +import com.google.gerrit.server.util.time.TimeUtil; import com.google.gwtorm.server.OrmException; import com.google.inject.Inject; import com.google.inject.Provider; diff --git a/java/com/google/gerrit/server/restapi/change/PostHashtags.java b/java/com/google/gerrit/server/restapi/change/PostHashtags.java index f31d04e9a6..c67fb67979 100644 --- a/java/com/google/gerrit/server/restapi/change/PostHashtags.java +++ b/java/com/google/gerrit/server/restapi/change/PostHashtags.java @@ -15,7 +15,6 @@ package com.google.gerrit.server.restapi.change; import com.google.common.collect.ImmutableSortedSet; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.extensions.api.changes.HashtagsInput; import com.google.gerrit.extensions.restapi.Response; import com.google.gerrit.extensions.restapi.RestApiException; @@ -29,6 +28,7 @@ import com.google.gerrit.server.update.BatchUpdate; import com.google.gerrit.server.update.RetryHelper; import com.google.gerrit.server.update.RetryingRestModifyView; import com.google.gerrit.server.update.UpdateException; +import com.google.gerrit.server.util.time.TimeUtil; import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; diff --git a/java/com/google/gerrit/server/restapi/change/PostPrivate.java b/java/com/google/gerrit/server/restapi/change/PostPrivate.java index 5a13346069..3f37bc1c0f 100644 --- a/java/com/google/gerrit/server/restapi/change/PostPrivate.java +++ b/java/com/google/gerrit/server/restapi/change/PostPrivate.java @@ -17,7 +17,6 @@ package com.google.gerrit.server.restapi.change; import static com.google.gerrit.extensions.conditions.BooleanCondition.and; import static com.google.gerrit.extensions.conditions.BooleanCondition.or; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.extensions.conditions.BooleanCondition; import com.google.gerrit.extensions.restapi.AuthException; import com.google.gerrit.extensions.restapi.MethodNotAllowedException; @@ -35,6 +34,7 @@ import com.google.gerrit.server.update.BatchUpdate; import com.google.gerrit.server.update.RetryHelper; import com.google.gerrit.server.update.RetryingRestModifyView; import com.google.gerrit.server.update.UpdateException; +import com.google.gerrit.server.util.time.TimeUtil; import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; diff --git a/java/com/google/gerrit/server/restapi/change/PostReview.java b/java/com/google/gerrit/server/restapi/change/PostReview.java index 9bbaf696b9..ebd23c5d86 100644 --- a/java/com/google/gerrit/server/restapi/change/PostReview.java +++ b/java/com/google/gerrit/server/restapi/change/PostReview.java @@ -37,7 +37,6 @@ import com.google.common.flogger.FluentLogger; import com.google.common.hash.HashCode; import com.google.common.hash.Hashing; import com.google.gerrit.common.Nullable; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.common.data.LabelType; import com.google.gerrit.common.data.LabelTypes; import com.google.gerrit.extensions.api.changes.AddReviewerInput; @@ -120,6 +119,7 @@ import com.google.gerrit.server.update.RetryHelper; import com.google.gerrit.server.update.RetryingRestModifyView; import com.google.gerrit.server.update.UpdateException; import com.google.gerrit.server.util.LabelVote; +import com.google.gerrit.server.util.time.TimeUtil; import com.google.gson.Gson; import com.google.gwtorm.server.OrmException; import com.google.inject.Inject; diff --git a/java/com/google/gerrit/server/restapi/change/PostReviewers.java b/java/com/google/gerrit/server/restapi/change/PostReviewers.java index a9c48e36fc..cbaad81099 100644 --- a/java/com/google/gerrit/server/restapi/change/PostReviewers.java +++ b/java/com/google/gerrit/server/restapi/change/PostReviewers.java @@ -24,7 +24,6 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.ListMultimap; import com.google.common.collect.Lists; import com.google.gerrit.common.Nullable; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.common.data.GroupDescription; import com.google.gerrit.extensions.api.changes.AddReviewerInput; import com.google.gerrit.extensions.api.changes.AddReviewerResult; @@ -73,6 +72,7 @@ import com.google.gerrit.server.update.BatchUpdate; import com.google.gerrit.server.update.RetryHelper; import com.google.gerrit.server.update.RetryingRestCollectionModifyView; import com.google.gerrit.server.update.UpdateException; +import com.google.gerrit.server.util.time.TimeUtil; import com.google.gwtorm.server.OrmException; import com.google.inject.Inject; import com.google.inject.Provider; diff --git a/java/com/google/gerrit/server/restapi/change/PutAssignee.java b/java/com/google/gerrit/server/restapi/change/PutAssignee.java index 21bd3ce4ec..c11a858c78 100644 --- a/java/com/google/gerrit/server/restapi/change/PutAssignee.java +++ b/java/com/google/gerrit/server/restapi/change/PutAssignee.java @@ -15,7 +15,6 @@ package com.google.gerrit.server.restapi.change; import com.google.common.base.Strings; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.extensions.api.changes.AddReviewerInput; import com.google.gerrit.extensions.api.changes.AssigneeInput; import com.google.gerrit.extensions.api.changes.NotifyHandling; @@ -40,6 +39,7 @@ import com.google.gerrit.server.update.BatchUpdate; import com.google.gerrit.server.update.RetryHelper; import com.google.gerrit.server.update.RetryingRestModifyView; import com.google.gerrit.server.update.UpdateException; +import com.google.gerrit.server.util.time.TimeUtil; import com.google.gwtorm.server.OrmException; import com.google.inject.Inject; import com.google.inject.Provider; diff --git a/java/com/google/gerrit/server/restapi/change/PutDescription.java b/java/com/google/gerrit/server/restapi/change/PutDescription.java index 38fc2e2ea9..3b5edb26ef 100644 --- a/java/com/google/gerrit/server/restapi/change/PutDescription.java +++ b/java/com/google/gerrit/server/restapi/change/PutDescription.java @@ -15,7 +15,6 @@ package com.google.gerrit.server.restapi.change; import com.google.common.base.Strings; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.extensions.common.DescriptionInput; import com.google.gerrit.extensions.restapi.Response; import com.google.gerrit.extensions.restapi.RestApiException; @@ -35,6 +34,7 @@ import com.google.gerrit.server.update.ChangeContext; import com.google.gerrit.server.update.RetryHelper; import com.google.gerrit.server.update.RetryingRestModifyView; import com.google.gerrit.server.update.UpdateException; +import com.google.gerrit.server.util.time.TimeUtil; import com.google.gwtorm.server.OrmException; import com.google.inject.Inject; import com.google.inject.Provider; diff --git a/java/com/google/gerrit/server/restapi/change/PutDraftComment.java b/java/com/google/gerrit/server/restapi/change/PutDraftComment.java index 76ef1069a2..72358bd6c8 100644 --- a/java/com/google/gerrit/server/restapi/change/PutDraftComment.java +++ b/java/com/google/gerrit/server/restapi/change/PutDraftComment.java @@ -16,7 +16,6 @@ package com.google.gerrit.server.restapi.change; import static com.google.gerrit.server.CommentsUtil.setCommentRevId; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.extensions.api.changes.DraftInput; import com.google.gerrit.extensions.common.CommentInfo; import com.google.gerrit.extensions.restapi.BadRequestException; @@ -41,6 +40,7 @@ import com.google.gerrit.server.update.ChangeContext; import com.google.gerrit.server.update.RetryHelper; import com.google.gerrit.server.update.RetryingRestModifyView; import com.google.gerrit.server.update.UpdateException; +import com.google.gerrit.server.util.time.TimeUtil; import com.google.gwtorm.server.OrmException; import com.google.inject.Inject; import com.google.inject.Provider; diff --git a/java/com/google/gerrit/server/restapi/change/PutMessage.java b/java/com/google/gerrit/server/restapi/change/PutMessage.java index bee0ed7ad8..bcd0e9e455 100644 --- a/java/com/google/gerrit/server/restapi/change/PutMessage.java +++ b/java/com/google/gerrit/server/restapi/change/PutMessage.java @@ -15,7 +15,6 @@ package com.google.gerrit.server.restapi.change; import com.google.gerrit.common.FooterConstants; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.extensions.api.changes.NotifyHandling; import com.google.gerrit.extensions.common.CommitMessageInput; import com.google.gerrit.extensions.restapi.AuthException; @@ -44,6 +43,7 @@ import com.google.gerrit.server.update.RetryHelper; import com.google.gerrit.server.update.RetryingRestModifyView; import com.google.gerrit.server.update.UpdateException; import com.google.gerrit.server.util.CommitMessageUtil; +import com.google.gerrit.server.util.time.TimeUtil; import com.google.gwtorm.server.OrmException; import com.google.inject.Inject; import com.google.inject.Provider; diff --git a/java/com/google/gerrit/server/restapi/change/PutTopic.java b/java/com/google/gerrit/server/restapi/change/PutTopic.java index 45a837a34a..7f56c91a46 100644 --- a/java/com/google/gerrit/server/restapi/change/PutTopic.java +++ b/java/com/google/gerrit/server/restapi/change/PutTopic.java @@ -15,7 +15,6 @@ package com.google.gerrit.server.restapi.change; import com.google.common.base.Strings; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.extensions.api.changes.TopicInput; import com.google.gerrit.extensions.restapi.BadRequestException; import com.google.gerrit.extensions.restapi.Response; @@ -38,6 +37,7 @@ import com.google.gerrit.server.update.Context; import com.google.gerrit.server.update.RetryHelper; import com.google.gerrit.server.update.RetryingRestModifyView; import com.google.gerrit.server.update.UpdateException; +import com.google.gerrit.server.util.time.TimeUtil; import com.google.gwtorm.server.OrmException; import com.google.inject.Inject; import com.google.inject.Provider; diff --git a/java/com/google/gerrit/server/restapi/change/Rebase.java b/java/com/google/gerrit/server/restapi/change/Rebase.java index 0fffb581a9..2e2f5652b4 100644 --- a/java/com/google/gerrit/server/restapi/change/Rebase.java +++ b/java/com/google/gerrit/server/restapi/change/Rebase.java @@ -17,7 +17,6 @@ package com.google.gerrit.server.restapi.change; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; import com.google.common.flogger.FluentLogger; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.extensions.api.changes.RebaseInput; import com.google.gerrit.extensions.client.ListChangesOption; import com.google.gerrit.extensions.common.ChangeInfo; @@ -49,6 +48,7 @@ import com.google.gerrit.server.update.BatchUpdate; import com.google.gerrit.server.update.RetryHelper; import com.google.gerrit.server.update.RetryingRestModifyView; import com.google.gerrit.server.update.UpdateException; +import com.google.gerrit.server.util.time.TimeUtil; import com.google.gwtorm.server.OrmException; import com.google.inject.Inject; import com.google.inject.Provider; diff --git a/java/com/google/gerrit/server/restapi/change/Restore.java b/java/com/google/gerrit/server/restapi/change/Restore.java index a29347f814..d6f9e2bdc6 100644 --- a/java/com/google/gerrit/server/restapi/change/Restore.java +++ b/java/com/google/gerrit/server/restapi/change/Restore.java @@ -16,7 +16,6 @@ package com.google.gerrit.server.restapi.change; import com.google.common.base.Strings; import com.google.common.flogger.FluentLogger; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.extensions.api.changes.RestoreInput; import com.google.gerrit.extensions.common.ChangeInfo; import com.google.gerrit.extensions.restapi.ResourceConflictException; @@ -46,6 +45,7 @@ import com.google.gerrit.server.update.Context; import com.google.gerrit.server.update.RetryHelper; import com.google.gerrit.server.update.RetryingRestModifyView; import com.google.gerrit.server.update.UpdateException; +import com.google.gerrit.server.util.time.TimeUtil; import com.google.gwtorm.server.OrmException; import com.google.inject.Inject; import com.google.inject.Provider; diff --git a/java/com/google/gerrit/server/restapi/change/Revert.java b/java/com/google/gerrit/server/restapi/change/Revert.java index e00868136a..6383b297db 100644 --- a/java/com/google/gerrit/server/restapi/change/Revert.java +++ b/java/com/google/gerrit/server/restapi/change/Revert.java @@ -20,7 +20,6 @@ import static com.google.gerrit.server.permissions.RefPermission.CREATE_CHANGE; import com.google.common.base.Strings; import com.google.common.collect.ListMultimap; import com.google.common.flogger.FluentLogger; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.extensions.api.changes.NotifyHandling; import com.google.gerrit.extensions.api.changes.RecipientType; import com.google.gerrit.extensions.api.changes.RevertInput; @@ -66,6 +65,7 @@ import com.google.gerrit.server.update.Context; import com.google.gerrit.server.update.RetryHelper; import com.google.gerrit.server.update.RetryingRestModifyView; import com.google.gerrit.server.update.UpdateException; +import com.google.gerrit.server.util.time.TimeUtil; import com.google.gwtorm.server.OrmException; import com.google.inject.Inject; import com.google.inject.Provider; diff --git a/java/com/google/gerrit/server/restapi/change/SetReadyForReview.java b/java/com/google/gerrit/server/restapi/change/SetReadyForReview.java index faf946ffb2..78386124ae 100644 --- a/java/com/google/gerrit/server/restapi/change/SetReadyForReview.java +++ b/java/com/google/gerrit/server/restapi/change/SetReadyForReview.java @@ -17,7 +17,6 @@ package com.google.gerrit.server.restapi.change; import static com.google.gerrit.extensions.conditions.BooleanCondition.and; import static com.google.gerrit.extensions.conditions.BooleanCondition.or; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.extensions.restapi.AuthException; import com.google.gerrit.extensions.restapi.ResourceConflictException; import com.google.gerrit.extensions.restapi.Response; @@ -38,6 +37,7 @@ import com.google.gerrit.server.update.BatchUpdate; import com.google.gerrit.server.update.RetryHelper; import com.google.gerrit.server.update.RetryingRestModifyView; import com.google.gerrit.server.update.UpdateException; +import com.google.gerrit.server.util.time.TimeUtil; import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; diff --git a/java/com/google/gerrit/server/restapi/change/SetWorkInProgress.java b/java/com/google/gerrit/server/restapi/change/SetWorkInProgress.java index 1f9d81f764..7d88aba59a 100644 --- a/java/com/google/gerrit/server/restapi/change/SetWorkInProgress.java +++ b/java/com/google/gerrit/server/restapi/change/SetWorkInProgress.java @@ -17,7 +17,6 @@ package com.google.gerrit.server.restapi.change; import static com.google.gerrit.extensions.conditions.BooleanCondition.and; import static com.google.gerrit.extensions.conditions.BooleanCondition.or; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.extensions.restapi.AuthException; import com.google.gerrit.extensions.restapi.ResourceConflictException; import com.google.gerrit.extensions.restapi.Response; @@ -38,6 +37,7 @@ import com.google.gerrit.server.update.BatchUpdate; import com.google.gerrit.server.update.RetryHelper; import com.google.gerrit.server.update.RetryingRestModifyView; import com.google.gerrit.server.update.UpdateException; +import com.google.gerrit.server.util.time.TimeUtil; import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; diff --git a/java/com/google/gerrit/server/restapi/project/CreateAccessChange.java b/java/com/google/gerrit/server/restapi/project/CreateAccessChange.java index 33155f139a..feb37c09fe 100644 --- a/java/com/google/gerrit/server/restapi/project/CreateAccessChange.java +++ b/java/com/google/gerrit/server/restapi/project/CreateAccessChange.java @@ -15,7 +15,6 @@ package com.google.gerrit.server.restapi.project; import com.google.common.collect.ImmutableMap; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.common.data.AccessSection; import com.google.gerrit.common.errors.InvalidNameException; import com.google.gerrit.extensions.api.access.ProjectAccessInput; @@ -44,6 +43,7 @@ import com.google.gerrit.server.project.ProjectConfig; import com.google.gerrit.server.project.ProjectResource; import com.google.gerrit.server.update.BatchUpdate; import com.google.gerrit.server.update.UpdateException; +import com.google.gerrit.server.util.time.TimeUtil; import com.google.gwtorm.server.OrmException; import com.google.inject.Inject; import com.google.inject.Provider; diff --git a/java/com/google/gerrit/server/restapi/project/CreateTag.java b/java/com/google/gerrit/server/restapi/project/CreateTag.java index dd73b0b082..e72deaf255 100644 --- a/java/com/google/gerrit/server/restapi/project/CreateTag.java +++ b/java/com/google/gerrit/server/restapi/project/CreateTag.java @@ -18,7 +18,6 @@ import static org.eclipse.jgit.lib.Constants.R_TAGS; import com.google.common.base.Strings; import com.google.common.flogger.FluentLogger; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.extensions.api.projects.TagInfo; import com.google.gerrit.extensions.api.projects.TagInput; import com.google.gerrit.extensions.restapi.AuthException; @@ -40,6 +39,7 @@ import com.google.gerrit.server.project.ProjectResource; import com.google.gerrit.server.project.RefUtil; import com.google.gerrit.server.project.RefUtil.InvalidRevisionException; import com.google.gerrit.server.project.TagResource; +import com.google.gerrit.server.util.time.TimeUtil; import com.google.inject.Inject; import com.google.inject.Singleton; import java.io.IOException; diff --git a/java/com/google/gerrit/server/schema/BUILD b/java/com/google/gerrit/server/schema/BUILD index 44bede9f34..a04def6c74 100644 --- a/java/com/google/gerrit/server/schema/BUILD +++ b/java/com/google/gerrit/server/schema/BUILD @@ -12,6 +12,7 @@ java_library( "//java/com/google/gerrit/metrics", "//java/com/google/gerrit/reviewdb:server", "//java/com/google/gerrit/server", + "//java/com/google/gerrit/server/util/time", "//java/org/eclipse/jgit:server", "//lib:guava", "//lib:gwtorm", diff --git a/java/com/google/gerrit/server/schema/GroupBundle.java b/java/com/google/gerrit/server/schema/GroupBundle.java index a15cedcf2e..26cd96ada3 100644 --- a/java/com/google/gerrit/server/schema/GroupBundle.java +++ b/java/com/google/gerrit/server/schema/GroupBundle.java @@ -31,7 +31,6 @@ import com.google.common.collect.MultimapBuilder; import com.google.common.collect.Multimaps; import com.google.common.collect.Streams; import com.google.common.flogger.FluentLogger; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.reviewdb.client.AccountGroup; import com.google.gerrit.reviewdb.client.AccountGroupById; @@ -44,6 +43,7 @@ import com.google.gerrit.reviewdb.server.ReviewDbWrapper; import com.google.gerrit.server.group.InternalGroup; import com.google.gerrit.server.group.db.AuditLogReader; import com.google.gerrit.server.group.db.GroupConfig; +import com.google.gerrit.server.util.time.TimeUtil; import com.google.gwtorm.jdbc.JdbcSchema; import com.google.gwtorm.server.OrmException; import com.google.inject.Inject; diff --git a/java/com/google/gerrit/server/schema/GroupRebuilder.java b/java/com/google/gerrit/server/schema/GroupRebuilder.java index be8dcff9e8..54cbb86ac4 100644 --- a/java/com/google/gerrit/server/schema/GroupRebuilder.java +++ b/java/com/google/gerrit/server/schema/GroupRebuilder.java @@ -25,7 +25,6 @@ import com.google.common.collect.ListMultimap; import com.google.common.collect.MultimapBuilder; import com.google.common.collect.Sets; import com.google.gerrit.common.Nullable; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.reviewdb.client.AccountGroup; import com.google.gerrit.reviewdb.client.AccountGroupById; @@ -43,6 +42,7 @@ import com.google.gerrit.server.group.db.InternalGroupCreation; import com.google.gerrit.server.group.db.InternalGroupUpdate; import com.google.gerrit.server.group.db.InternalGroupUpdate.MemberModification; import com.google.gerrit.server.group.db.InternalGroupUpdate.SubgroupModification; +import com.google.gerrit.server.util.time.TimeUtil; import com.google.gwtorm.server.OrmDuplicateKeyException; import java.io.IOException; import java.sql.Timestamp; diff --git a/java/com/google/gerrit/server/submit/MergeOp.java b/java/com/google/gerrit/server/submit/MergeOp.java index 43d5f75cfb..c233da8d00 100644 --- a/java/com/google/gerrit/server/submit/MergeOp.java +++ b/java/com/google/gerrit/server/submit/MergeOp.java @@ -33,7 +33,6 @@ import com.google.common.collect.MultimapBuilder; import com.google.common.collect.SetMultimap; import com.google.common.flogger.FluentLogger; import com.google.gerrit.common.Nullable; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.common.data.SubmitRecord; import com.google.gerrit.common.data.SubmitRequirement; import com.google.gerrit.common.data.SubmitTypeRecord; @@ -79,6 +78,7 @@ import com.google.gerrit.server.update.ChangeContext; import com.google.gerrit.server.update.RetryHelper; import com.google.gerrit.server.update.RetryHelper.ActionType; import com.google.gerrit.server.update.UpdateException; +import com.google.gerrit.server.util.time.TimeUtil; import com.google.gwtorm.server.OrmException; import com.google.inject.Inject; import com.google.inject.Provider; diff --git a/java/com/google/gerrit/server/util/time/BUILD b/java/com/google/gerrit/server/util/time/BUILD new file mode 100644 index 0000000000..1d1305d266 --- /dev/null +++ b/java/com/google/gerrit/server/util/time/BUILD @@ -0,0 +1,9 @@ +java_library( + name = "time", + srcs = glob(["**/*.java"]), + visibility = ["//visibility:public"], + deps = [ + "//lib:guava", + "//lib/jgit/org.eclipse.jgit:jgit", + ], +) diff --git a/java/com/google/gerrit/common/TimeUtil.java b/java/com/google/gerrit/server/util/time/TimeUtil.java similarity index 95% rename from java/com/google/gerrit/common/TimeUtil.java rename to java/com/google/gerrit/server/util/time/TimeUtil.java index e42eb09fc0..645dbb92f8 100644 --- a/java/com/google/gerrit/common/TimeUtil.java +++ b/java/com/google/gerrit/server/util/time/TimeUtil.java @@ -12,9 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.common; +package com.google.gerrit.server.util.time; -import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.VisibleForTesting; import java.sql.Timestamp; import java.time.Instant; @@ -25,7 +24,6 @@ import org.eclipse.jgit.util.FS; import org.eclipse.jgit.util.SystemReader; /** Static utility methods for dealing with dates and times. */ -@GwtIncompatible("Unemulated Java 8 functionalities") public class TimeUtil { private static final LongSupplier SYSTEM_CURRENT_MILLIS_SUPPLIER = System::currentTimeMillis; diff --git a/java/com/google/gerrit/sshd/BUILD b/java/com/google/gerrit/sshd/BUILD index 47b1d897eb..8e1f112d25 100644 --- a/java/com/google/gerrit/sshd/BUILD +++ b/java/com/google/gerrit/sshd/BUILD @@ -18,6 +18,7 @@ java_library( "//java/com/google/gerrit/server/logging", "//java/com/google/gerrit/server/restapi", "//java/com/google/gerrit/server/schema", + "//java/com/google/gerrit/server/util/time", "//java/com/google/gerrit/util/cli", "//java/org/eclipse/jgit:server", "//lib:args4j", diff --git a/java/com/google/gerrit/sshd/BaseCommand.java b/java/com/google/gerrit/sshd/BaseCommand.java index dae9016d9b..942a571325 100644 --- a/java/com/google/gerrit/sshd/BaseCommand.java +++ b/java/com/google/gerrit/sshd/BaseCommand.java @@ -20,7 +20,6 @@ import com.google.common.base.Joiner; import com.google.common.flogger.FluentLogger; import com.google.common.util.concurrent.Atomics; import com.google.gerrit.common.Nullable; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.extensions.annotations.PluginName; import com.google.gerrit.extensions.registration.DynamicMap; import com.google.gerrit.extensions.restapi.AuthException; @@ -36,6 +35,7 @@ import com.google.gerrit.server.permissions.PermissionBackend; import com.google.gerrit.server.permissions.PermissionBackendException; import com.google.gerrit.server.project.NoSuchChangeException; import com.google.gerrit.server.project.NoSuchProjectException; +import com.google.gerrit.server.util.time.TimeUtil; import com.google.gerrit.sshd.SshScope.Context; import com.google.gerrit.util.cli.CmdLineParser; import com.google.gerrit.util.cli.EndOfOptionsHandler; diff --git a/java/com/google/gerrit/sshd/SshLog.java b/java/com/google/gerrit/sshd/SshLog.java index 98c649d3db..bd8a3ee974 100644 --- a/java/com/google/gerrit/sshd/SshLog.java +++ b/java/com/google/gerrit/sshd/SshLog.java @@ -16,7 +16,6 @@ package com.google.gerrit.sshd; import com.google.common.collect.ListMultimap; import com.google.common.collect.MultimapBuilder; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.extensions.events.LifecycleListener; import com.google.gerrit.server.CurrentUser; import com.google.gerrit.server.IdentifiedUser; @@ -29,6 +28,7 @@ import com.google.gerrit.server.config.GerritConfigListener; import com.google.gerrit.server.config.GerritServerConfig; import com.google.gerrit.server.ioutil.HexFormat; import com.google.gerrit.server.util.SystemLog; +import com.google.gerrit.server.util.time.TimeUtil; import com.google.gerrit.sshd.SshScope.Context; import com.google.inject.Inject; import com.google.inject.Provider; diff --git a/java/com/google/gerrit/sshd/SshScope.java b/java/com/google/gerrit/sshd/SshScope.java index 2659831fe0..99787d8f8e 100644 --- a/java/com/google/gerrit/sshd/SshScope.java +++ b/java/com/google/gerrit/sshd/SshScope.java @@ -14,7 +14,6 @@ package com.google.gerrit.sshd; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.reviewdb.server.ReviewDb; import com.google.gerrit.server.CurrentUser; import com.google.gerrit.server.IdentifiedUser; @@ -23,6 +22,7 @@ import com.google.gerrit.server.config.RequestScopedReviewDbProvider; import com.google.gerrit.server.util.RequestContext; import com.google.gerrit.server.util.ThreadLocalRequestContext; import com.google.gerrit.server.util.ThreadLocalRequestScopePropagator; +import com.google.gerrit.server.util.time.TimeUtil; import com.google.gwtorm.server.SchemaFactory; import com.google.inject.Inject; import com.google.inject.Key; diff --git a/java/com/google/gerrit/sshd/commands/QueryShell.java b/java/com/google/gerrit/sshd/commands/QueryShell.java index 9651f39dd2..fe102ab750 100644 --- a/java/com/google/gerrit/sshd/commands/QueryShell.java +++ b/java/com/google/gerrit/sshd/commands/QueryShell.java @@ -16,11 +16,11 @@ package com.google.gerrit.sshd.commands; import static java.nio.charset.StandardCharsets.UTF_8; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.common.Version; import com.google.gerrit.reviewdb.server.ReviewDb; import com.google.gerrit.reviewdb.server.ReviewDbUtil; import com.google.gerrit.server.schema.ReviewDbFactory; +import com.google.gerrit.server.util.time.TimeUtil; import com.google.gson.JsonArray; import com.google.gson.JsonObject; import com.google.gwtorm.jdbc.JdbcSchema; diff --git a/java/com/google/gerrit/sshd/commands/ShowCaches.java b/java/com/google/gerrit/sshd/commands/ShowCaches.java index 3c95884659..e4c14d89c6 100644 --- a/java/com/google/gerrit/sshd/commands/ShowCaches.java +++ b/java/com/google/gerrit/sshd/commands/ShowCaches.java @@ -19,7 +19,6 @@ import static com.google.gerrit.common.data.GlobalCapability.VIEW_CACHES; import static com.google.gerrit.sshd.CommandMetaData.Mode.MASTER_OR_SLAVE; import com.google.common.base.Strings; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.common.Version; import com.google.gerrit.extensions.annotations.RequiresAnyCapability; import com.google.gerrit.extensions.events.LifecycleListener; @@ -38,6 +37,7 @@ import com.google.gerrit.server.restapi.config.GetSummary.ThreadSummaryInfo; import com.google.gerrit.server.restapi.config.ListCaches; import com.google.gerrit.server.restapi.config.ListCaches.CacheInfo; import com.google.gerrit.server.restapi.config.ListCaches.CacheType; +import com.google.gerrit.server.util.time.TimeUtil; import com.google.gerrit.sshd.CommandMetaData; import com.google.gerrit.sshd.SshCommand; import com.google.gerrit.sshd.SshDaemon; diff --git a/java/com/google/gerrit/sshd/commands/ShowConnections.java b/java/com/google/gerrit/sshd/commands/ShowConnections.java index baadf028a2..0faf8030ad 100644 --- a/java/com/google/gerrit/sshd/commands/ShowConnections.java +++ b/java/com/google/gerrit/sshd/commands/ShowConnections.java @@ -19,12 +19,12 @@ import static com.google.common.collect.ImmutableList.toImmutableList; import static com.google.gerrit.sshd.CommandMetaData.Mode.MASTER_OR_SLAVE; import com.google.common.collect.ImmutableList; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.common.data.GlobalCapability; import com.google.gerrit.extensions.annotations.RequiresCapability; import com.google.gerrit.server.CurrentUser; import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.server.ioutil.HexFormat; +import com.google.gerrit.server.util.time.TimeUtil; import com.google.gerrit.sshd.CommandMetaData; import com.google.gerrit.sshd.SshCommand; import com.google.gerrit.sshd.SshDaemon; diff --git a/java/com/google/gerrit/sshd/commands/ShowQueue.java b/java/com/google/gerrit/sshd/commands/ShowQueue.java index 5d7fdbf345..2a7bd6e0a5 100644 --- a/java/com/google/gerrit/sshd/commands/ShowQueue.java +++ b/java/com/google/gerrit/sshd/commands/ShowQueue.java @@ -19,7 +19,6 @@ import static com.google.gerrit.sshd.CommandMetaData.Mode.MASTER_OR_SLAVE; import com.google.common.base.MoreObjects; import com.google.common.collect.LinkedListMultimap; import com.google.common.collect.ListMultimap; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.extensions.restapi.AuthException; import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.server.config.ConfigResource; @@ -30,6 +29,7 @@ import com.google.gerrit.server.permissions.PermissionBackend; import com.google.gerrit.server.permissions.PermissionBackendException; import com.google.gerrit.server.restapi.config.ListTasks; import com.google.gerrit.server.restapi.config.ListTasks.TaskInfo; +import com.google.gerrit.server.util.time.TimeUtil; import com.google.gerrit.sshd.AdminHighPriorityCommand; import com.google.gerrit.sshd.CommandMetaData; import com.google.gerrit.sshd.SshCommand; diff --git a/java/com/google/gerrit/testing/BUILD b/java/com/google/gerrit/testing/BUILD index 15ceb778ef..412a071520 100644 --- a/java/com/google/gerrit/testing/BUILD +++ b/java/com/google/gerrit/testing/BUILD @@ -32,6 +32,7 @@ java_library( "//java/com/google/gerrit/server/logging", "//java/com/google/gerrit/server/restapi", "//java/com/google/gerrit/server/schema", + "//java/com/google/gerrit/server/util/time", "//lib:guava", "//lib:gwtorm", "//lib:h2", diff --git a/java/com/google/gerrit/testing/FakeAccountCache.java b/java/com/google/gerrit/testing/FakeAccountCache.java index 224a5bfb46..b99a32d7df 100644 --- a/java/com/google/gerrit/testing/FakeAccountCache.java +++ b/java/com/google/gerrit/testing/FakeAccountCache.java @@ -17,12 +17,12 @@ package com.google.gerrit.testing; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; import com.google.gerrit.common.Nullable; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.server.account.AccountCache; import com.google.gerrit.server.account.AccountState; import com.google.gerrit.server.config.AllUsersName; import com.google.gerrit.server.config.AllUsersNameProvider; +import com.google.gerrit.server.util.time.TimeUtil; import java.util.HashMap; import java.util.Map; import java.util.Optional; diff --git a/java/com/google/gerrit/testing/TestChanges.java b/java/com/google/gerrit/testing/TestChanges.java index 31ef80572e..8e752faa63 100644 --- a/java/com/google/gerrit/testing/TestChanges.java +++ b/java/com/google/gerrit/testing/TestChanges.java @@ -17,7 +17,6 @@ package com.google.gerrit.testing; import static com.google.common.base.MoreObjects.firstNonNull; import com.google.common.collect.Ordering; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.extensions.config.FactoryModule; import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.reviewdb.client.Branch; @@ -32,6 +31,7 @@ import com.google.gerrit.server.notedb.AbstractChangeNotes; import com.google.gerrit.server.notedb.ChangeNotes; import com.google.gerrit.server.notedb.ChangeUpdate; import com.google.gerrit.server.notedb.NotesMigration; +import com.google.gerrit.server.util.time.TimeUtil; import com.google.inject.Injector; import java.util.TimeZone; import java.util.concurrent.atomic.AtomicInteger; diff --git a/java/com/google/gerrit/testing/TestTimeUtil.java b/java/com/google/gerrit/testing/TestTimeUtil.java index 1233810e79..9228123b82 100644 --- a/java/com/google/gerrit/testing/TestTimeUtil.java +++ b/java/com/google/gerrit/testing/TestTimeUtil.java @@ -17,7 +17,7 @@ package com.google.gerrit.testing; import static com.google.common.base.Preconditions.checkState; import static java.util.concurrent.TimeUnit.MILLISECONDS; -import com.google.gerrit.common.TimeUtil; +import com.google.gerrit.server.util.time.TimeUtil; import java.sql.Timestamp; import java.time.Instant; import java.time.LocalDateTime; @@ -51,7 +51,7 @@ public class TestTimeUtil { } /** - * Set the clock step used by {@link com.google.gerrit.common.TimeUtil}. + * Set the clock step used by {@link com.google.gerrit.server.util.time.TimeUtil}. * * @param clockStep amount to increment clock by on each lookup. * @param clockStepUnit time unit for {@code clockStep}. diff --git a/javatests/com/google/gerrit/acceptance/BUILD b/javatests/com/google/gerrit/acceptance/BUILD index 9246abb960..32804ef16f 100644 --- a/javatests/com/google/gerrit/acceptance/BUILD +++ b/javatests/com/google/gerrit/acceptance/BUILD @@ -5,6 +5,7 @@ junit_tests( srcs = glob(["**/*.java"]), deps = [ "//java/com/google/gerrit/acceptance:lib", + "//java/com/google/gerrit/server/util/time", "//lib:guava", "//lib/jgit/org.eclipse.jgit:jgit", "//lib/truth", diff --git a/javatests/com/google/gerrit/acceptance/ProjectResetterTest.java b/javatests/com/google/gerrit/acceptance/ProjectResetterTest.java index 1844ec6237..53d8ef8799 100644 --- a/javatests/com/google/gerrit/acceptance/ProjectResetterTest.java +++ b/javatests/com/google/gerrit/acceptance/ProjectResetterTest.java @@ -18,7 +18,6 @@ import static com.google.common.truth.Truth.assertThat; import com.google.common.collect.ImmutableSet; import com.google.gerrit.common.Nullable; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.reviewdb.client.AccountGroup; import com.google.gerrit.reviewdb.client.Project; @@ -31,6 +30,7 @@ import com.google.gerrit.server.config.AllUsersNameProvider; import com.google.gerrit.server.index.account.AccountIndexer; import com.google.gerrit.server.index.group.GroupIndexer; import com.google.gerrit.server.project.ProjectCache; +import com.google.gerrit.server.util.time.TimeUtil; import com.google.gerrit.testing.GerritBaseTests; import com.google.gerrit.testing.InMemoryRepositoryManager; import com.google.gerrit.testing.TestTimeUtil; diff --git a/javatests/com/google/gerrit/acceptance/api/accounts/AccountIT.java b/javatests/com/google/gerrit/acceptance/api/accounts/AccountIT.java index 013d153282..c0c8709049 100644 --- a/javatests/com/google/gerrit/acceptance/api/accounts/AccountIT.java +++ b/javatests/com/google/gerrit/acceptance/api/accounts/AccountIT.java @@ -57,7 +57,6 @@ import com.google.gerrit.acceptance.UseSsh; import com.google.gerrit.acceptance.testsuite.account.AccountOperations; import com.google.gerrit.acceptance.testsuite.account.TestSshKeys; import com.google.gerrit.common.Nullable; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.common.data.AccessSection; import com.google.gerrit.common.data.GlobalCapability; import com.google.gerrit.common.data.GroupReference; @@ -125,6 +124,7 @@ import com.google.gerrit.server.project.RefPattern; import com.google.gerrit.server.query.account.InternalAccountQuery; import com.google.gerrit.server.update.RetryHelper; import com.google.gerrit.server.util.MagicBranch; +import com.google.gerrit.server.util.time.TimeUtil; import com.google.gerrit.server.validators.AccountActivationValidationListener; import com.google.gerrit.server.validators.ValidationException; import com.google.gerrit.testing.ConfigSuite; diff --git a/javatests/com/google/gerrit/acceptance/api/accounts/BUILD b/javatests/com/google/gerrit/acceptance/api/accounts/BUILD index 9bc30ba969..31f3f91fce 100644 --- a/javatests/com/google/gerrit/acceptance/api/accounts/BUILD +++ b/javatests/com/google/gerrit/acceptance/api/accounts/BUILD @@ -8,5 +8,8 @@ acceptance_tests( "noci", "no_windows", ], - deps = ["//java/com/google/gerrit/mail"], + deps = [ + "//java/com/google/gerrit/mail", + "//java/com/google/gerrit/server/util/time", + ], ) diff --git a/javatests/com/google/gerrit/acceptance/api/change/BUILD b/javatests/com/google/gerrit/acceptance/api/change/BUILD index fd6c6d12ce..92794887d9 100644 --- a/javatests/com/google/gerrit/acceptance/api/change/BUILD +++ b/javatests/com/google/gerrit/acceptance/api/change/BUILD @@ -7,4 +7,5 @@ acceptance_tests( "api", "noci", ], + deps = ["//java/com/google/gerrit/server/util/time"], ) diff --git a/javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java b/javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java index 88803ec835..395a797895 100644 --- a/javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java +++ b/javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java @@ -69,7 +69,6 @@ import com.google.gerrit.acceptance.PushOneCommit; import com.google.gerrit.acceptance.TestProjectInput; import com.google.gerrit.acceptance.testsuite.account.AccountOperations; import com.google.gerrit.common.FooterConstants; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.common.data.LabelFunction; import com.google.gerrit.common.data.LabelType; import com.google.gerrit.common.data.Permission; @@ -146,6 +145,7 @@ import com.google.gerrit.server.restapi.change.PostReview; import com.google.gerrit.server.update.BatchUpdate; import com.google.gerrit.server.update.BatchUpdateOp; import com.google.gerrit.server.update.ChangeContext; +import com.google.gerrit.server.util.time.TimeUtil; import com.google.gerrit.testing.FakeEmailSender.Message; import com.google.gerrit.testing.TestTimeUtil; import com.google.inject.Inject; diff --git a/javatests/com/google/gerrit/acceptance/api/group/BUILD b/javatests/com/google/gerrit/acceptance/api/group/BUILD index a0b70cc810..da36a02bd0 100644 --- a/javatests/com/google/gerrit/acceptance/api/group/BUILD +++ b/javatests/com/google/gerrit/acceptance/api/group/BUILD @@ -8,6 +8,7 @@ acceptance_tests( ":util", "//java/com/google/gerrit/server/group/db/testing", "//java/com/google/gerrit/server/group/testing", + "//java/com/google/gerrit/server/util/time", "//java/com/google/gerrit/truth", "//javatests/com/google/gerrit/acceptance/rest/account:util", ], diff --git a/javatests/com/google/gerrit/acceptance/api/group/GroupsIT.java b/javatests/com/google/gerrit/acceptance/api/group/GroupsIT.java index d6be96043c..ade0f3c144 100644 --- a/javatests/com/google/gerrit/acceptance/api/group/GroupsIT.java +++ b/javatests/com/google/gerrit/acceptance/api/group/GroupsIT.java @@ -40,7 +40,6 @@ import com.google.gerrit.acceptance.Sandboxed; import com.google.gerrit.acceptance.TestAccount; import com.google.gerrit.acceptance.testsuite.account.AccountOperations; import com.google.gerrit.common.Nullable; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.common.data.GlobalCapability; import com.google.gerrit.common.data.GroupReference; import com.google.gerrit.common.data.Permission; @@ -82,6 +81,7 @@ import com.google.gerrit.server.group.db.InternalGroupUpdate; import com.google.gerrit.server.index.group.GroupIndexer; import com.google.gerrit.server.index.group.StalenessChecker; import com.google.gerrit.server.util.MagicBranch; +import com.google.gerrit.server.util.time.TimeUtil; import com.google.gerrit.testing.TestTimeUtil; import com.google.inject.Inject; import java.io.IOException; diff --git a/javatests/com/google/gerrit/acceptance/rest/change/AbstractSubmit.java b/javatests/com/google/gerrit/acceptance/rest/change/AbstractSubmit.java index af11149047..08a76e4773 100644 --- a/javatests/com/google/gerrit/acceptance/rest/change/AbstractSubmit.java +++ b/javatests/com/google/gerrit/acceptance/rest/change/AbstractSubmit.java @@ -38,7 +38,6 @@ import com.google.gerrit.acceptance.PushOneCommit; import com.google.gerrit.acceptance.TestAccount; import com.google.gerrit.acceptance.TestProjectInput; import com.google.gerrit.common.Nullable; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.common.data.Permission; import com.google.gerrit.extensions.api.changes.ChangeApi; import com.google.gerrit.extensions.api.changes.SubmitInput; @@ -78,6 +77,7 @@ import com.google.gerrit.server.restapi.change.Submit; import com.google.gerrit.server.update.BatchUpdate; import com.google.gerrit.server.update.BatchUpdateOp; import com.google.gerrit.server.update.ChangeContext; +import com.google.gerrit.server.util.time.TimeUtil; import com.google.gerrit.server.validators.ValidationException; import com.google.gerrit.testing.ConfigSuite; import com.google.gerrit.testing.TestTimeUtil; diff --git a/javatests/com/google/gerrit/acceptance/rest/change/BUILD b/javatests/com/google/gerrit/acceptance/rest/change/BUILD index 46eb0ba3e6..d955f1b84a 100644 --- a/javatests/com/google/gerrit/acceptance/rest/change/BUILD +++ b/javatests/com/google/gerrit/acceptance/rest/change/BUILD @@ -35,5 +35,6 @@ java_library( deps = [ "//java/com/google/gerrit/acceptance:lib", "//java/com/google/gerrit/server/restapi", + "//java/com/google/gerrit/server/util/time", ], ) diff --git a/javatests/com/google/gerrit/acceptance/server/change/BUILD b/javatests/com/google/gerrit/acceptance/server/change/BUILD index 6c79618cf3..4d1634d8e8 100644 --- a/javatests/com/google/gerrit/acceptance/server/change/BUILD +++ b/javatests/com/google/gerrit/acceptance/server/change/BUILD @@ -4,4 +4,5 @@ acceptance_tests( srcs = glob(["*IT.java"]), group = "server_change", labels = ["server"], + deps = ["//java/com/google/gerrit/server/util/time"], ) diff --git a/javatests/com/google/gerrit/acceptance/server/change/ConsistencyCheckerIT.java b/javatests/com/google/gerrit/acceptance/server/change/ConsistencyCheckerIT.java index 29c043af65..5c3a703750 100644 --- a/javatests/com/google/gerrit/acceptance/server/change/ConsistencyCheckerIT.java +++ b/javatests/com/google/gerrit/acceptance/server/change/ConsistencyCheckerIT.java @@ -27,7 +27,6 @@ import com.google.gerrit.acceptance.NoHttpd; import com.google.gerrit.acceptance.TestAccount; import com.google.gerrit.common.FooterConstants; import com.google.gerrit.common.Nullable; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.extensions.api.changes.FixInput; import com.google.gerrit.extensions.api.changes.NotifyHandling; import com.google.gerrit.extensions.client.ChangeStatus; @@ -52,6 +51,7 @@ import com.google.gerrit.server.update.BatchUpdate; import com.google.gerrit.server.update.BatchUpdateOp; import com.google.gerrit.server.update.ChangeContext; import com.google.gerrit.server.update.RepoContext; +import com.google.gerrit.server.util.time.TimeUtil; import com.google.gerrit.testing.InMemoryRepositoryManager; import com.google.gerrit.testing.NoteDbMode; import com.google.gerrit.testing.TestChanges; diff --git a/javatests/com/google/gerrit/acceptance/server/change/GetRelatedIT.java b/javatests/com/google/gerrit/acceptance/server/change/GetRelatedIT.java index 70ca5f577f..5d3b22348c 100644 --- a/javatests/com/google/gerrit/acceptance/server/change/GetRelatedIT.java +++ b/javatests/com/google/gerrit/acceptance/server/change/GetRelatedIT.java @@ -27,7 +27,6 @@ import com.google.gerrit.acceptance.GerritConfig; import com.google.gerrit.acceptance.PushOneCommit; import com.google.gerrit.acceptance.RestResponse; import com.google.gerrit.common.RawInputUtil; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.extensions.common.CommitInfo; import com.google.gerrit.extensions.common.EditInfo; import com.google.gerrit.index.IndexConfig; @@ -41,6 +40,7 @@ import com.google.gerrit.server.restapi.change.GetRelated.RelatedInfo; import com.google.gerrit.server.update.BatchUpdate; import com.google.gerrit.server.update.BatchUpdateOp; import com.google.gerrit.server.update.ChangeContext; +import com.google.gerrit.server.util.time.TimeUtil; import com.google.gerrit.testing.ConfigSuite; import com.google.gerrit.testing.TestTimeUtil; import com.google.gwtorm.server.OrmException; diff --git a/javatests/com/google/gerrit/acceptance/server/notedb/BUILD b/javatests/com/google/gerrit/acceptance/server/notedb/BUILD index 4965402475..bdb3f3bc3c 100644 --- a/javatests/com/google/gerrit/acceptance/server/notedb/BUILD +++ b/javatests/com/google/gerrit/acceptance/server/notedb/BUILD @@ -10,5 +10,8 @@ acceptance_tests( # TODO(dborowitz): Fix leaks in local disk tests so we can reduce heap size. # http://crbug.com/gerrit/8567 vm_args = ["-Xmx1024m"], - deps = ["//java/com/google/gerrit/server/schema"], + deps = [ + "//java/com/google/gerrit/server/schema", + "//java/com/google/gerrit/server/util/time", + ], ) diff --git a/javatests/com/google/gerrit/acceptance/server/notedb/ChangeRebuilderIT.java b/javatests/com/google/gerrit/acceptance/server/notedb/ChangeRebuilderIT.java index 5f60ce3215..29f1b7dfc3 100644 --- a/javatests/com/google/gerrit/acceptance/server/notedb/ChangeRebuilderIT.java +++ b/javatests/com/google/gerrit/acceptance/server/notedb/ChangeRebuilderIT.java @@ -35,7 +35,6 @@ import com.google.gerrit.acceptance.AbstractDaemonTest; import com.google.gerrit.acceptance.AcceptanceTestRequestScope; import com.google.gerrit.acceptance.PushOneCommit; import com.google.gerrit.acceptance.TestAccount; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.common.data.GlobalCapability; import com.google.gerrit.extensions.api.changes.DraftInput; import com.google.gerrit.extensions.api.changes.ReviewInput; @@ -83,6 +82,7 @@ import com.google.gerrit.server.update.BatchUpdate; import com.google.gerrit.server.update.BatchUpdateOp; import com.google.gerrit.server.update.ChangeContext; import com.google.gerrit.server.update.UpdateException; +import com.google.gerrit.server.util.time.TimeUtil; import com.google.gerrit.testing.ConfigSuite; import com.google.gerrit.testing.NoteDbChecker; import com.google.gerrit.testing.NoteDbMode; diff --git a/javatests/com/google/gerrit/acceptance/server/notedb/NoteDbOnlyIT.java b/javatests/com/google/gerrit/acceptance/server/notedb/NoteDbOnlyIT.java index c45ea996f8..8d6fecdfc4 100644 --- a/javatests/com/google/gerrit/acceptance/server/notedb/NoteDbOnlyIT.java +++ b/javatests/com/google/gerrit/acceptance/server/notedb/NoteDbOnlyIT.java @@ -24,7 +24,6 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Streams; import com.google.gerrit.acceptance.AbstractDaemonTest; import com.google.gerrit.acceptance.PushOneCommit; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.extensions.api.changes.ReviewInput; import com.google.gerrit.extensions.restapi.ResourceConflictException; import com.google.gerrit.reviewdb.client.Change; @@ -35,6 +34,7 @@ import com.google.gerrit.server.update.BatchUpdateOp; import com.google.gerrit.server.update.ChangeContext; import com.google.gerrit.server.update.RepoContext; import com.google.gerrit.server.update.RetryHelper; +import com.google.gerrit.server.util.time.TimeUtil; import com.google.gerrit.testing.ConfigSuite; import com.google.inject.Inject; import java.io.IOException; diff --git a/javatests/com/google/gerrit/acceptance/server/notedb/NoteDbPrimaryIT.java b/javatests/com/google/gerrit/acceptance/server/notedb/NoteDbPrimaryIT.java index b7ce7bc90e..26d546184a 100644 --- a/javatests/com/google/gerrit/acceptance/server/notedb/NoteDbPrimaryIT.java +++ b/javatests/com/google/gerrit/acceptance/server/notedb/NoteDbPrimaryIT.java @@ -35,7 +35,6 @@ import com.google.gerrit.acceptance.AbstractDaemonTest; import com.google.gerrit.acceptance.NoHttpd; import com.google.gerrit.acceptance.PushOneCommit; import com.google.gerrit.common.Nullable; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.extensions.api.changes.DraftInput; import com.google.gerrit.extensions.api.changes.ReviewInput; import com.google.gerrit.extensions.api.changes.ReviewInput.CommentInput; @@ -62,6 +61,7 @@ import com.google.gerrit.server.notedb.NoteDbChangeState.PrimaryStorage; import com.google.gerrit.server.notedb.PrimaryStorageMigrator; import com.google.gerrit.server.notedb.TestChangeRebuilderWrapper; import com.google.gerrit.server.update.RetryHelper; +import com.google.gerrit.server.util.time.TimeUtil; import com.google.gerrit.testing.ConfigSuite; import com.google.gerrit.testing.NoteDbMode; import com.google.gerrit.testing.TestTimeUtil; diff --git a/javatests/com/google/gerrit/server/BUILD b/javatests/com/google/gerrit/server/BUILD index 7be18272de..8749b7a056 100644 --- a/javatests/com/google/gerrit/server/BUILD +++ b/javatests/com/google/gerrit/server/BUILD @@ -53,6 +53,7 @@ junit_tests( "//java/com/google/gerrit/server/project/testing:project-test-util", "//java/com/google/gerrit/server/restapi", "//java/com/google/gerrit/server/schema", + "//java/com/google/gerrit/server/util/time", "//java/com/google/gerrit/testing:gerrit-test-util", "//java/com/google/gerrit/truth", "//java/org/eclipse/jgit:server", diff --git a/javatests/com/google/gerrit/server/IdentifiedUserTest.java b/javatests/com/google/gerrit/server/IdentifiedUserTest.java index 1a76dac926..da6c56dc0f 100644 --- a/javatests/com/google/gerrit/server/IdentifiedUserTest.java +++ b/javatests/com/google/gerrit/server/IdentifiedUserTest.java @@ -17,7 +17,6 @@ package com.google.gerrit.server; import static com.google.common.truth.Truth.assertThat; import static com.google.inject.Scopes.SINGLETON; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.server.account.AccountCache; import com.google.gerrit.server.account.FakeRealm; @@ -29,6 +28,7 @@ import com.google.gerrit.server.config.CanonicalWebUrl; import com.google.gerrit.server.config.DisableReverseDnsLookup; import com.google.gerrit.server.config.GerritServerConfig; import com.google.gerrit.server.group.SystemGroupBackend; +import com.google.gerrit.server.util.time.TimeUtil; import com.google.gerrit.testing.ConfigSuite; import com.google.gerrit.testing.FakeAccountCache; import com.google.inject.AbstractModule; diff --git a/javatests/com/google/gerrit/server/change/LabelNormalizerTest.java b/javatests/com/google/gerrit/server/change/LabelNormalizerTest.java index bce00cd622..5a067f189a 100644 --- a/javatests/com/google/gerrit/server/change/LabelNormalizerTest.java +++ b/javatests/com/google/gerrit/server/change/LabelNormalizerTest.java @@ -22,7 +22,6 @@ import static com.google.gerrit.server.project.testing.Util.value; import static org.junit.Assert.assertEquals; import com.google.common.collect.ImmutableList; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.common.data.AccessSection; import com.google.gerrit.common.data.LabelType; import com.google.gerrit.lifecycle.LifecycleManager; @@ -48,6 +47,7 @@ import com.google.gerrit.server.project.ProjectConfig; import com.google.gerrit.server.schema.SchemaCreator; import com.google.gerrit.server.util.RequestContext; import com.google.gerrit.server.util.ThreadLocalRequestContext; +import com.google.gerrit.server.util.time.TimeUtil; import com.google.gerrit.testing.InMemoryDatabase; import com.google.gerrit.testing.InMemoryModule; import com.google.inject.Guice; diff --git a/javatests/com/google/gerrit/server/git/meta/VersionedMetaDataTest.java b/javatests/com/google/gerrit/server/git/meta/VersionedMetaDataTest.java index 56e53b9822..7e12439ab0 100644 --- a/javatests/com/google/gerrit/server/git/meta/VersionedMetaDataTest.java +++ b/javatests/com/google/gerrit/server/git/meta/VersionedMetaDataTest.java @@ -22,11 +22,11 @@ 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.common.TimeUtil; 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; import java.util.Arrays; diff --git a/javatests/com/google/gerrit/server/group/db/AbstractGroupTest.java b/javatests/com/google/gerrit/server/group/db/AbstractGroupTest.java index 943f784df2..9fc6da1874 100644 --- a/javatests/com/google/gerrit/server/group/db/AbstractGroupTest.java +++ b/javatests/com/google/gerrit/server/group/db/AbstractGroupTest.java @@ -17,7 +17,6 @@ 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.TimeUtil; import com.google.gerrit.common.data.GroupDescription; import com.google.gerrit.extensions.common.CommitInfo; import com.google.gerrit.reviewdb.client.Account; @@ -28,6 +27,7 @@ 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.group.InternalGroup; +import com.google.gerrit.server.util.time.TimeUtil; import com.google.gerrit.testing.GerritBaseTests; import com.google.gerrit.testing.InMemoryRepositoryManager; 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 eee552999f..f3dd5d61af 100644 --- a/javatests/com/google/gerrit/server/group/db/BUILD +++ b/javatests/com/google/gerrit/server/group/db/BUILD @@ -14,6 +14,7 @@ junit_tests( "//java/com/google/gerrit/server", "//java/com/google/gerrit/server/group/db/testing", "//java/com/google/gerrit/server/group/testing", + "//java/com/google/gerrit/server/util/time", "//java/com/google/gerrit/testing:gerrit-test-util", "//java/com/google/gerrit/truth", "//lib:guava", diff --git a/javatests/com/google/gerrit/server/group/db/GroupConfigTest.java b/javatests/com/google/gerrit/server/group/db/GroupConfigTest.java index dec1d63c82..a5744d1254 100644 --- a/javatests/com/google/gerrit/server/group/db/GroupConfigTest.java +++ b/javatests/com/google/gerrit/server/group/db/GroupConfigTest.java @@ -22,7 +22,6 @@ import static org.hamcrest.CoreMatchers.instanceOf; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; import com.google.gerrit.common.Nullable; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.common.data.GroupDescription; import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.reviewdb.client.AccountGroup; @@ -32,6 +31,7 @@ import com.google.gerrit.server.extensions.events.GitReferenceUpdated; import com.google.gerrit.server.git.meta.MetaDataUpdate; import com.google.gerrit.server.group.InternalGroup; import com.google.gerrit.server.group.testing.InternalGroupSubject; +import com.google.gerrit.server.util.time.TimeUtil; import com.google.gerrit.truth.OptionalSubject; import com.google.gwtorm.client.KeyUtil; import com.google.gwtorm.server.StandardKeyEncoder; diff --git a/javatests/com/google/gerrit/server/group/db/GroupNameNotesTest.java b/javatests/com/google/gerrit/server/group/db/GroupNameNotesTest.java index a70df6bfa4..42d01e2bfd 100644 --- a/javatests/com/google/gerrit/server/group/db/GroupNameNotesTest.java +++ b/javatests/com/google/gerrit/server/group/db/GroupNameNotesTest.java @@ -23,7 +23,6 @@ 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.TimeUtil; import com.google.gerrit.common.data.GroupReference; import com.google.gerrit.common.data.testing.GroupReferenceSubject; import com.google.gerrit.extensions.common.CommitInfo; @@ -36,6 +35,7 @@ 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; import com.google.gerrit.truth.ListSubject; diff --git a/javatests/com/google/gerrit/server/index/account/AccountFieldTest.java b/javatests/com/google/gerrit/server/index/account/AccountFieldTest.java index f0230d5e08..c69fa200e1 100644 --- a/javatests/com/google/gerrit/server/index/account/AccountFieldTest.java +++ b/javatests/com/google/gerrit/server/index/account/AccountFieldTest.java @@ -21,13 +21,13 @@ import static java.util.stream.Collectors.toList; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; import com.google.common.collect.Streams; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.reviewdb.client.RefNames; import com.google.gerrit.server.account.AccountState; import com.google.gerrit.server.account.externalids.ExternalId; import com.google.gerrit.server.config.AllUsersName; import com.google.gerrit.server.config.AllUsersNameProvider; +import com.google.gerrit.server.util.time.TimeUtil; import com.google.gerrit.testing.GerritBaseTests; import java.util.List; import org.eclipse.jgit.lib.ObjectId; diff --git a/javatests/com/google/gerrit/server/index/change/ChangeFieldTest.java b/javatests/com/google/gerrit/server/index/change/ChangeFieldTest.java index 8e8a0ea38c..d3792b73bb 100644 --- a/javatests/com/google/gerrit/server/index/change/ChangeFieldTest.java +++ b/javatests/com/google/gerrit/server/index/change/ChangeFieldTest.java @@ -21,13 +21,13 @@ import static java.util.stream.Collectors.toList; import com.google.common.collect.HashBasedTable; import com.google.common.collect.ImmutableList; import com.google.common.collect.Table; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.common.data.SubmitRecord; import com.google.gerrit.common.data.SubmitRequirement; import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.reviewdb.client.Change; import com.google.gerrit.server.ReviewerSet; import com.google.gerrit.server.notedb.ReviewerStateInternal; +import com.google.gerrit.server.util.time.TimeUtil; import com.google.gerrit.testing.GerritBaseTests; import com.google.gerrit.testing.TestTimeUtil; import java.sql.Timestamp; diff --git a/javatests/com/google/gerrit/server/mail/send/FromAddressGeneratorProviderTest.java b/javatests/com/google/gerrit/server/mail/send/FromAddressGeneratorProviderTest.java index f99c356d26..75923b4df4 100644 --- a/javatests/com/google/gerrit/server/mail/send/FromAddressGeneratorProviderTest.java +++ b/javatests/com/google/gerrit/server/mail/send/FromAddressGeneratorProviderTest.java @@ -21,13 +21,13 @@ import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.replay; import static org.easymock.EasyMock.verify; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.mail.Address; import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.server.account.AccountCache; import com.google.gerrit.server.account.AccountState; import com.google.gerrit.server.config.AllUsersName; import com.google.gerrit.server.config.AllUsersNameProvider; +import com.google.gerrit.server.util.time.TimeUtil; import java.util.Arrays; import java.util.List; import java.util.Optional; diff --git a/javatests/com/google/gerrit/server/notedb/AbstractChangeNotesTest.java b/javatests/com/google/gerrit/server/notedb/AbstractChangeNotesTest.java index cc7302fb25..b93e9c13eb 100644 --- a/javatests/com/google/gerrit/server/notedb/AbstractChangeNotesTest.java +++ b/javatests/com/google/gerrit/server/notedb/AbstractChangeNotesTest.java @@ -18,7 +18,6 @@ import static com.google.inject.Scopes.SINGLETON; import static java.util.concurrent.TimeUnit.SECONDS; import com.google.common.collect.ImmutableList; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.common.data.SubmitRecord; import com.google.gerrit.extensions.config.FactoryModule; import com.google.gerrit.metrics.DisabledMetricMaker; @@ -51,6 +50,7 @@ import com.google.gerrit.server.git.GitModule; import com.google.gerrit.server.git.GitRepositoryManager; import com.google.gerrit.server.group.SystemGroupBackend; import com.google.gerrit.server.project.ProjectCache; +import com.google.gerrit.server.util.time.TimeUtil; import com.google.gerrit.testing.ConfigSuite; import com.google.gerrit.testing.FakeAccountCache; import com.google.gerrit.testing.GerritBaseTests; diff --git a/javatests/com/google/gerrit/server/notedb/ChangeBundleTest.java b/javatests/com/google/gerrit/server/notedb/ChangeBundleTest.java index 722dd08256..fc2a272082 100644 --- a/javatests/com/google/gerrit/server/notedb/ChangeBundleTest.java +++ b/javatests/com/google/gerrit/server/notedb/ChangeBundleTest.java @@ -16,18 +16,17 @@ package com.google.gerrit.server.notedb; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.truth.Truth.assertThat; -import static com.google.gerrit.common.TimeUtil.truncateToSecond; import static com.google.gerrit.server.notedb.ChangeBundle.Source.NOTE_DB; import static com.google.gerrit.server.notedb.ChangeBundle.Source.REVIEW_DB; import static com.google.gerrit.server.notedb.ReviewerStateInternal.CC; import static com.google.gerrit.server.notedb.ReviewerStateInternal.REVIEWER; +import static com.google.gerrit.server.util.time.TimeUtil.truncateToSecond; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static java.util.concurrent.TimeUnit.SECONDS; import com.google.common.collect.HashBasedTable; import com.google.common.collect.ImmutableList; import com.google.common.collect.Table; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.reviewdb.client.Change; import com.google.gerrit.reviewdb.client.ChangeMessage; @@ -40,6 +39,7 @@ import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.reviewdb.client.RevId; import com.google.gerrit.server.ReviewerSet; import com.google.gerrit.server.notedb.rebuild.ChangeRebuilderImpl; +import com.google.gerrit.server.util.time.TimeUtil; import com.google.gerrit.testing.GerritBaseTests; import com.google.gerrit.testing.TestChanges; import com.google.gerrit.testing.TestTimeUtil; diff --git a/javatests/com/google/gerrit/server/notedb/ChangeNotesParserTest.java b/javatests/com/google/gerrit/server/notedb/ChangeNotesParserTest.java index 313fa07798..79dcd5bed3 100644 --- a/javatests/com/google/gerrit/server/notedb/ChangeNotesParserTest.java +++ b/javatests/com/google/gerrit/server/notedb/ChangeNotesParserTest.java @@ -17,9 +17,9 @@ package com.google.gerrit.server.notedb; import static com.google.common.truth.Truth.assertThat; import static org.junit.Assert.fail; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.reviewdb.client.Change; import com.google.gerrit.server.notedb.ChangeNotesCommit.ChangeNotesRevWalk; +import com.google.gerrit.server.util.time.TimeUtil; import org.eclipse.jgit.errors.ConfigInvalidException; import org.eclipse.jgit.internal.storage.dfs.InMemoryRepository; import org.eclipse.jgit.junit.TestRepository; diff --git a/javatests/com/google/gerrit/server/notedb/ChangeNotesTest.java b/javatests/com/google/gerrit/server/notedb/ChangeNotesTest.java index 1f974e2907..549f5dbea3 100644 --- a/javatests/com/google/gerrit/server/notedb/ChangeNotesTest.java +++ b/javatests/com/google/gerrit/server/notedb/ChangeNotesTest.java @@ -33,7 +33,6 @@ import com.google.common.collect.ImmutableTable; import com.google.common.collect.Iterables; import com.google.common.collect.ListMultimap; import com.google.common.collect.Lists; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.common.data.SubmitRecord; import com.google.gerrit.mail.Address; import com.google.gerrit.reviewdb.client.Account; @@ -53,6 +52,7 @@ import com.google.gerrit.server.ReviewerSet; import com.google.gerrit.server.config.GerritServerId; import com.google.gerrit.server.logging.RequestId; import com.google.gerrit.server.notedb.ChangeNotesCommit.ChangeNotesRevWalk; +import com.google.gerrit.server.util.time.TimeUtil; import com.google.gerrit.testing.TestChanges; import com.google.gerrit.testing.TestTimeUtil; import com.google.gwtorm.server.OrmException; diff --git a/javatests/com/google/gerrit/server/notedb/CommentJsonMigratorTest.java b/javatests/com/google/gerrit/server/notedb/CommentJsonMigratorTest.java index 2031a14a14..b9027bc175 100644 --- a/javatests/com/google/gerrit/server/notedb/CommentJsonMigratorTest.java +++ b/javatests/com/google/gerrit/server/notedb/CommentJsonMigratorTest.java @@ -23,7 +23,6 @@ import com.google.common.collect.ImmutableListMultimap; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ListMultimap; import com.google.common.collect.Multimaps; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.reviewdb.client.Change; import com.google.gerrit.reviewdb.client.Comment; import com.google.gerrit.reviewdb.client.PatchLineComment.Status; @@ -35,6 +34,7 @@ import com.google.gerrit.server.CommentsUtil; import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.server.config.AllUsersName; import com.google.gerrit.server.notedb.CommentJsonMigrator.ProjectMigrationResult; +import com.google.gerrit.server.util.time.TimeUtil; import com.google.gerrit.testing.TestChanges; import com.google.inject.Inject; import java.io.ByteArrayOutputStream; diff --git a/javatests/com/google/gerrit/server/notedb/CommitMessageOutputTest.java b/javatests/com/google/gerrit/server/notedb/CommitMessageOutputTest.java index 8daf67fe8f..1b504312a8 100644 --- a/javatests/com/google/gerrit/server/notedb/CommitMessageOutputTest.java +++ b/javatests/com/google/gerrit/server/notedb/CommitMessageOutputTest.java @@ -19,12 +19,12 @@ import static com.google.gerrit.server.notedb.ReviewerStateInternal.CC; import static com.google.gerrit.server.notedb.ReviewerStateInternal.REVIEWER; import com.google.common.collect.ImmutableList; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.mail.Address; import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.reviewdb.client.Change; import com.google.gerrit.server.CurrentUser; import com.google.gerrit.server.logging.RequestId; +import com.google.gerrit.server.util.time.TimeUtil; import com.google.gerrit.testing.ConfigSuite; import com.google.gerrit.testing.TestChanges; import java.util.Date; diff --git a/javatests/com/google/gerrit/server/notedb/NoteDbChangeStateTest.java b/javatests/com/google/gerrit/server/notedb/NoteDbChangeStateTest.java index fe27cac0cb..c82135e116 100644 --- a/javatests/com/google/gerrit/server/notedb/NoteDbChangeStateTest.java +++ b/javatests/com/google/gerrit/server/notedb/NoteDbChangeStateTest.java @@ -17,11 +17,11 @@ package com.google.gerrit.server.notedb; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth8.assertThat; -import static com.google.gerrit.common.TimeUtil.nowTs; import static com.google.gerrit.server.notedb.NoteDbChangeState.PrimaryStorage.NOTE_DB; import static com.google.gerrit.server.notedb.NoteDbChangeState.PrimaryStorage.REVIEW_DB; import static com.google.gerrit.server.notedb.NoteDbChangeState.applyDelta; import static com.google.gerrit.server.notedb.NoteDbChangeState.parse; +import static com.google.gerrit.server.util.time.TimeUtil.nowTs; import static org.eclipse.jgit.lib.ObjectId.zeroId; import com.google.common.collect.ImmutableMap; diff --git a/javatests/com/google/gerrit/server/notedb/rebuild/EventSorterTest.java b/javatests/com/google/gerrit/server/notedb/rebuild/EventSorterTest.java index 5a1ec2b0a4..c81a176d2c 100644 --- a/javatests/com/google/gerrit/server/notedb/rebuild/EventSorterTest.java +++ b/javatests/com/google/gerrit/server/notedb/rebuild/EventSorterTest.java @@ -20,11 +20,11 @@ import static org.junit.Assert.fail; import com.google.common.collect.Collections2; import com.google.common.collect.Lists; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.reviewdb.client.Change; import com.google.gerrit.reviewdb.client.PatchSet; import com.google.gerrit.server.notedb.ChangeUpdate; +import com.google.gerrit.server.util.time.TimeUtil; import com.google.gerrit.testing.TestTimeUtil; import java.sql.Timestamp; import java.util.ArrayList; diff --git a/javatests/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java b/javatests/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java index e995858894..41f60bbe34 100644 --- a/javatests/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java +++ b/javatests/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java @@ -40,7 +40,6 @@ import com.google.common.collect.Lists; import com.google.common.collect.Streams; import com.google.common.truth.ThrowableSubject; import com.google.gerrit.common.Nullable; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.common.data.LabelType; import com.google.gerrit.common.data.Permission; import com.google.gerrit.extensions.api.GerritApi; @@ -116,6 +115,7 @@ import com.google.gerrit.server.util.ManualRequestContext; import com.google.gerrit.server.util.OneOffRequestContext; import com.google.gerrit.server.util.RequestContext; import com.google.gerrit.server.util.ThreadLocalRequestContext; +import com.google.gerrit.server.util.time.TimeUtil; import com.google.gerrit.testing.DisabledReviewDb; import com.google.gerrit.testing.GerritServerTests; import com.google.gerrit.testing.InMemoryDatabase; diff --git a/javatests/com/google/gerrit/server/query/change/BUILD b/javatests/com/google/gerrit/server/query/change/BUILD index 09e3243e8b..c27be68548 100644 --- a/javatests/com/google/gerrit/server/query/change/BUILD +++ b/javatests/com/google/gerrit/server/query/change/BUILD @@ -18,6 +18,7 @@ java_library( "//java/com/google/gerrit/server", "//java/com/google/gerrit/server/project/testing:project-test-util", "//java/com/google/gerrit/server/schema", + "//java/com/google/gerrit/server/util/time", "//java/com/google/gerrit/testing:gerrit-test-util", "//lib:guava", "//lib:gwtorm", diff --git a/javatests/com/google/gerrit/server/rules/BUILD b/javatests/com/google/gerrit/server/rules/BUILD index 8f4c90ded0..62d9a79177 100644 --- a/javatests/com/google/gerrit/server/rules/BUILD +++ b/javatests/com/google/gerrit/server/rules/BUILD @@ -10,6 +10,7 @@ junit_tests( "//java/com/google/gerrit/reviewdb:server", "//java/com/google/gerrit/server", "//java/com/google/gerrit/server/project/testing:project-test-util", + "//java/com/google/gerrit/server/util/time", "//java/com/google/gerrit/testing:gerrit-test-util", "//lib:guava", "//lib/guice", diff --git a/javatests/com/google/gerrit/server/rules/PrologTestCase.java b/javatests/com/google/gerrit/server/rules/PrologTestCase.java index e8eea2d597..f4d8eacb3d 100644 --- a/javatests/com/google/gerrit/server/rules/PrologTestCase.java +++ b/javatests/com/google/gerrit/server/rules/PrologTestCase.java @@ -18,7 +18,7 @@ import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertWithMessage; import static java.nio.charset.StandardCharsets.UTF_8; -import com.google.gerrit.common.TimeUtil; +import com.google.gerrit.server.util.time.TimeUtil; import com.google.gerrit.testing.GerritBaseTests; import com.google.inject.Guice; import com.google.inject.Module; diff --git a/javatests/com/google/gerrit/server/schema/GroupBundleTest.java b/javatests/com/google/gerrit/server/schema/GroupBundleTest.java index 43fd59a30c..c1de3a3b0e 100644 --- a/javatests/com/google/gerrit/server/schema/GroupBundleTest.java +++ b/javatests/com/google/gerrit/server/schema/GroupBundleTest.java @@ -16,7 +16,6 @@ package com.google.gerrit.server.schema; import static com.google.common.truth.Truth.assertThat; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.reviewdb.client.AccountGroup; import com.google.gerrit.reviewdb.client.AccountGroupById; @@ -24,6 +23,7 @@ import com.google.gerrit.reviewdb.client.AccountGroupByIdAud; import com.google.gerrit.reviewdb.client.AccountGroupMember; import com.google.gerrit.reviewdb.client.AccountGroupMemberAudit; import com.google.gerrit.server.schema.GroupBundle.Source; +import com.google.gerrit.server.util.time.TimeUtil; import com.google.gerrit.testing.GerritBaseTests; import com.google.gerrit.testing.TestTimeUtil; import java.sql.Timestamp; diff --git a/javatests/com/google/gerrit/server/schema/GroupRebuilderTest.java b/javatests/com/google/gerrit/server/schema/GroupRebuilderTest.java index c76a246172..bf6953afcd 100644 --- a/javatests/com/google/gerrit/server/schema/GroupRebuilderTest.java +++ b/javatests/com/google/gerrit/server/schema/GroupRebuilderTest.java @@ -22,7 +22,6 @@ import static com.google.gerrit.reviewdb.client.RefNames.REFS_GROUPNAMES; import com.google.common.collect.ImmutableList; import com.google.gerrit.common.Nullable; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.common.data.GroupDescription; import com.google.gerrit.common.data.GroupReference; import com.google.gerrit.extensions.common.CommitInfo; @@ -39,6 +38,7 @@ 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; import com.google.gerrit.testing.InMemoryRepositoryManager; diff --git a/javatests/com/google/gerrit/server/schema/Schema_150_to_151_Test.java b/javatests/com/google/gerrit/server/schema/Schema_150_to_151_Test.java index 42af2cad37..4d5db6da3b 100644 --- a/javatests/com/google/gerrit/server/schema/Schema_150_to_151_Test.java +++ b/javatests/com/google/gerrit/server/schema/Schema_150_to_151_Test.java @@ -17,7 +17,6 @@ package com.google.gerrit.server.schema; import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.TruthJUnit.assume; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.reviewdb.client.AccountGroup; import com.google.gerrit.reviewdb.client.AccountGroup.Id; @@ -27,6 +26,7 @@ import com.google.gerrit.server.GerritPersonIdent; import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.server.Sequences; import com.google.gerrit.server.account.GroupUUID; +import com.google.gerrit.server.util.time.TimeUtil; import com.google.gerrit.testing.InMemoryTestEnvironment; import com.google.gerrit.testing.TestUpdateUI; import com.google.gwtorm.jdbc.JdbcSchema; diff --git a/javatests/com/google/gerrit/server/schema/Schema_166_to_167_WithGroupsInReviewDbTest.java b/javatests/com/google/gerrit/server/schema/Schema_166_to_167_WithGroupsInReviewDbTest.java index 75f93071a1..78fef3932c 100644 --- a/javatests/com/google/gerrit/server/schema/Schema_166_to_167_WithGroupsInReviewDbTest.java +++ b/javatests/com/google/gerrit/server/schema/Schema_166_to_167_WithGroupsInReviewDbTest.java @@ -23,7 +23,6 @@ import static com.google.gerrit.server.notedb.NotesMigration.SECTION_NOTE_DB; import static com.google.gerrit.truth.OptionalSubject.assertThat; import com.google.common.collect.ImmutableList; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.common.data.GroupReference; import com.google.gerrit.extensions.api.GerritApi; import com.google.gerrit.extensions.api.accounts.AccountInput; @@ -62,6 +61,7 @@ import com.google.gerrit.server.group.db.GroupNameNotes; import com.google.gerrit.server.group.db.GroupsConsistencyChecker; import com.google.gerrit.server.group.testing.InternalGroupSubject; import com.google.gerrit.server.group.testing.TestGroupBackend; +import com.google.gerrit.server.util.time.TimeUtil; import com.google.gerrit.testing.InMemoryTestEnvironment; import com.google.gerrit.testing.TestTimeUtil; import com.google.gerrit.testing.TestTimeUtil.TempClockStep; diff --git a/javatests/com/google/gerrit/server/schema/TestGroup.java b/javatests/com/google/gerrit/server/schema/TestGroup.java index 49cf02823f..4627e8be0e 100644 --- a/javatests/com/google/gerrit/server/schema/TestGroup.java +++ b/javatests/com/google/gerrit/server/schema/TestGroup.java @@ -15,8 +15,8 @@ package com.google.gerrit.server.schema; import com.google.auto.value.AutoValue; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.reviewdb.client.AccountGroup; +import com.google.gerrit.server.util.time.TimeUtil; import java.sql.Timestamp; import java.util.Optional; import org.junit.Ignore; diff --git a/javatests/com/google/gerrit/server/update/BUILD b/javatests/com/google/gerrit/server/update/BUILD index 46820c7317..cef3d631f8 100644 --- a/javatests/com/google/gerrit/server/update/BUILD +++ b/javatests/com/google/gerrit/server/update/BUILD @@ -31,6 +31,7 @@ junit_tests( "//java/com/google/gerrit/reviewdb:server", "//java/com/google/gerrit/server", "//java/com/google/gerrit/server/schema", + "//java/com/google/gerrit/server/util/time", "//java/com/google/gerrit/testing:gerrit-test-util", "//lib:guava", "//lib:gwtorm", diff --git a/javatests/com/google/gerrit/server/update/BatchUpdateTest.java b/javatests/com/google/gerrit/server/update/BatchUpdateTest.java index 67672d3116..70c4383cf8 100644 --- a/javatests/com/google/gerrit/server/update/BatchUpdateTest.java +++ b/javatests/com/google/gerrit/server/update/BatchUpdateTest.java @@ -16,11 +16,11 @@ package com.google.gerrit.server.update; import static org.junit.Assert.assertEquals; -import com.google.gerrit.common.TimeUtil; import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.reviewdb.server.ReviewDb; import com.google.gerrit.server.CurrentUser; import com.google.gerrit.server.git.GitRepositoryManager; +import com.google.gerrit.server.util.time.TimeUtil; import com.google.gerrit.testing.InMemoryTestEnvironment; import com.google.inject.Inject; import com.google.inject.Provider; diff --git a/plugins/BUILD b/plugins/BUILD index a7622b204a..137be6edc6 100644 --- a/plugins/BUILD +++ b/plugins/BUILD @@ -40,6 +40,7 @@ EXPORTS = [ "//java/com/google/gerrit/server/audit", "//java/com/google/gerrit/server/logging", "//java/com/google/gerrit/server/schema", + "//java/com/google/gerrit/server/util/time", "//java/com/google/gerrit/util/http", "//lib/commons:compress", "//lib/commons:dbcp",