From ea2e464368952a539e9accf65d0b46283aa0210f Mon Sep 17 00:00:00 2001 From: Dave Borowitz Date: Thu, 2 Aug 2018 11:26:19 -0700 Subject: [PATCH] Move cache serializers to dedicated subpackage Change-Id: Ia6a9814529ed958ee76202cf9e299ad04d7922fc --- java/com/google/gerrit/server/BUILD | 1 + .../server/auth/oauth/OAuthTokenCache.java | 6 +++--- .../gerrit/server/cache/CacheModule.java | 1 + .../server/cache/PersistentCacheBinding.java | 1 + .../server/cache/PersistentCacheDef.java | 2 ++ .../server/cache/PersistentCacheProvider.java | 2 ++ java/com/google/gerrit/server/cache/h2/BUILD | 1 + .../server/cache/h2/H2CacheDefProxy.java | 2 +- .../gerrit/server/cache/h2/H2CacheImpl.java | 2 +- .../server/cache/h2/ObjectKeyTypeImpl.java | 2 +- .../gerrit/server/cache/serialize/BUILD | 12 +++++++++++ .../BooleanCacheSerializer.java | 2 +- .../{ => serialize}/CacheSerializer.java | 2 +- .../{ => serialize}/EnumCacheSerializer.java | 2 +- .../IntKeyCacheSerializer.java | 2 +- .../IntegerCacheSerializer.java | 2 +- .../{ => serialize}/JavaCacheSerializer.java | 2 +- .../ProtoCacheSerializers.java | 2 +- .../StringCacheSerializer.java | 2 +- .../google/gerrit/server/cache/testing/BUILD | 1 + .../server/change/ChangeKindCacheImpl.java | 8 ++++---- .../server/change/MergeabilityCacheImpl.java | 8 ++++---- .../google/gerrit/server/git/TagCache.java | 2 +- java/com/google/gerrit/server/git/TagSet.java | 2 +- .../gerrit/server/git/TagSetHolder.java | 4 ++-- .../server/notedb/ChangeNotesCache.java | 6 +++--- .../server/notedb/ChangeNotesState.java | 8 ++++---- .../server/query/change/ConflictKey.java | 6 +++--- .../query/change/ConflictsCacheImpl.java | 2 +- javatests/com/google/gerrit/server/BUILD | 1 + .../auth/oauth/OAuthTokenCacheTest.java | 2 +- .../com/google/gerrit/server/cache/BUILD | 9 --------- .../com/google/gerrit/server/cache/h2/BUILD | 1 + .../gerrit/server/cache/h2/H2CacheTest.java | 2 +- .../gerrit/server/cache/serialize/BUILD | 20 +++++++++++++++++++ .../BooleanCacheSerializerTest.java | 2 +- .../EnumCacheSerializerTest.java | 2 +- .../IntKeyCacheSerializerTest.java | 2 +- .../IntegerCacheSerializerTest.java | 2 +- .../JavaCacheSerializerTest.java | 2 +- .../ProtoCacheSerializersTest.java | 4 ++-- .../StringCacheSerializerTest.java | 2 +- .../change/ChangeKindCacheImplTest.java | 2 +- .../server/notedb/ChangeNotesStateTest.java | 4 ++-- 44 files changed, 93 insertions(+), 59 deletions(-) create mode 100644 java/com/google/gerrit/server/cache/serialize/BUILD rename java/com/google/gerrit/server/cache/{ => serialize}/BooleanCacheSerializer.java (96%) rename java/com/google/gerrit/server/cache/{ => serialize}/CacheSerializer.java (96%) rename java/com/google/gerrit/server/cache/{ => serialize}/EnumCacheSerializer.java (96%) rename java/com/google/gerrit/server/cache/{ => serialize}/IntKeyCacheSerializer.java (96%) rename java/com/google/gerrit/server/cache/{ => serialize}/IntegerCacheSerializer.java (97%) rename java/com/google/gerrit/server/cache/{ => serialize}/JavaCacheSerializer.java (97%) rename java/com/google/gerrit/server/cache/{ => serialize}/ProtoCacheSerializers.java (98%) rename java/com/google/gerrit/server/cache/{ => serialize}/StringCacheSerializer.java (97%) create mode 100644 javatests/com/google/gerrit/server/cache/serialize/BUILD rename javatests/com/google/gerrit/server/cache/{ => serialize}/BooleanCacheSerializerTest.java (97%) rename javatests/com/google/gerrit/server/cache/{ => serialize}/EnumCacheSerializerTest.java (97%) rename javatests/com/google/gerrit/server/cache/{ => serialize}/IntKeyCacheSerializerTest.java (97%) rename javatests/com/google/gerrit/server/cache/{ => serialize}/IntegerCacheSerializerTest.java (97%) rename javatests/com/google/gerrit/server/cache/{ => serialize}/JavaCacheSerializerTest.java (96%) rename javatests/com/google/gerrit/server/cache/{ => serialize}/ProtoCacheSerializersTest.java (96%) rename javatests/com/google/gerrit/server/cache/{ => serialize}/StringCacheSerializerTest.java (97%) diff --git a/java/com/google/gerrit/server/BUILD b/java/com/google/gerrit/server/BUILD index e99c68652a..4002a4f116 100644 --- a/java/com/google/gerrit/server/BUILD +++ b/java/com/google/gerrit/server/BUILD @@ -40,6 +40,7 @@ java_library( "//java/com/google/gerrit/metrics", "//java/com/google/gerrit/prettify:server", "//java/com/google/gerrit/reviewdb:server", + "//java/com/google/gerrit/server/cache/serialize", "//java/com/google/gerrit/server/ioutil", "//java/com/google/gerrit/server/util/git", "//java/com/google/gerrit/util/cli", diff --git a/java/com/google/gerrit/server/auth/oauth/OAuthTokenCache.java b/java/com/google/gerrit/server/auth/oauth/OAuthTokenCache.java index 13a09a1426..4c364c5853 100644 --- a/java/com/google/gerrit/server/auth/oauth/OAuthTokenCache.java +++ b/java/com/google/gerrit/server/auth/oauth/OAuthTokenCache.java @@ -24,10 +24,10 @@ import com.google.gerrit.extensions.auth.oauth.OAuthTokenEncrypter; import com.google.gerrit.extensions.registration.DynamicItem; import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.server.cache.CacheModule; -import com.google.gerrit.server.cache.CacheSerializer; -import com.google.gerrit.server.cache.IntKeyCacheSerializer; -import com.google.gerrit.server.cache.ProtoCacheSerializers; import com.google.gerrit.server.cache.proto.Cache.OAuthTokenProto; +import com.google.gerrit.server.cache.serialize.CacheSerializer; +import com.google.gerrit.server.cache.serialize.IntKeyCacheSerializer; +import com.google.gerrit.server.cache.serialize.ProtoCacheSerializers; import com.google.inject.Inject; import com.google.inject.Module; import com.google.inject.Singleton; diff --git a/java/com/google/gerrit/server/cache/CacheModule.java b/java/com/google/gerrit/server/cache/CacheModule.java index ca399e73b0..28786247bd 100644 --- a/java/com/google/gerrit/server/cache/CacheModule.java +++ b/java/com/google/gerrit/server/cache/CacheModule.java @@ -20,6 +20,7 @@ import com.google.common.cache.LoadingCache; import com.google.common.cache.Weigher; import com.google.gerrit.extensions.annotations.Exports; import com.google.gerrit.extensions.config.FactoryModule; +import com.google.gerrit.server.cache.serialize.JavaCacheSerializer; import com.google.inject.Key; import com.google.inject.Provider; import com.google.inject.Scopes; diff --git a/java/com/google/gerrit/server/cache/PersistentCacheBinding.java b/java/com/google/gerrit/server/cache/PersistentCacheBinding.java index e8c74defb3..5635f44d77 100644 --- a/java/com/google/gerrit/server/cache/PersistentCacheBinding.java +++ b/java/com/google/gerrit/server/cache/PersistentCacheBinding.java @@ -16,6 +16,7 @@ package com.google.gerrit.server.cache; import com.google.common.cache.CacheLoader; import com.google.common.cache.Weigher; +import com.google.gerrit.server.cache.serialize.CacheSerializer; import java.time.Duration; /** Configure a persistent cache declared within a {@link CacheModule} instance. */ diff --git a/java/com/google/gerrit/server/cache/PersistentCacheDef.java b/java/com/google/gerrit/server/cache/PersistentCacheDef.java index 9bd120fd56..8de685c384 100644 --- a/java/com/google/gerrit/server/cache/PersistentCacheDef.java +++ b/java/com/google/gerrit/server/cache/PersistentCacheDef.java @@ -14,6 +14,8 @@ package com.google.gerrit.server.cache; +import com.google.gerrit.server.cache.serialize.CacheSerializer; + public interface PersistentCacheDef extends CacheDef { long diskLimit(); diff --git a/java/com/google/gerrit/server/cache/PersistentCacheProvider.java b/java/com/google/gerrit/server/cache/PersistentCacheProvider.java index f38c1ea495..59d66e3624 100644 --- a/java/com/google/gerrit/server/cache/PersistentCacheProvider.java +++ b/java/com/google/gerrit/server/cache/PersistentCacheProvider.java @@ -20,6 +20,8 @@ import com.google.common.cache.Cache; import com.google.common.cache.CacheLoader; import com.google.common.cache.Weigher; import com.google.gerrit.common.Nullable; +import com.google.gerrit.server.cache.serialize.CacheSerializer; +import com.google.gerrit.server.cache.serialize.JavaCacheSerializer; import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.TypeLiteral; diff --git a/java/com/google/gerrit/server/cache/h2/BUILD b/java/com/google/gerrit/server/cache/h2/BUILD index fc57a11796..2ce756bce3 100644 --- a/java/com/google/gerrit/server/cache/h2/BUILD +++ b/java/com/google/gerrit/server/cache/h2/BUILD @@ -8,6 +8,7 @@ java_library( "//java/com/google/gerrit/extensions:api", "//java/com/google/gerrit/lifecycle", "//java/com/google/gerrit/server", + "//java/com/google/gerrit/server/cache/serialize", "//lib:guava", "//lib:h2", "//lib/flogger:api", diff --git a/java/com/google/gerrit/server/cache/h2/H2CacheDefProxy.java b/java/com/google/gerrit/server/cache/h2/H2CacheDefProxy.java index 78de67dd02..48c0a5bd81 100644 --- a/java/com/google/gerrit/server/cache/h2/H2CacheDefProxy.java +++ b/java/com/google/gerrit/server/cache/h2/H2CacheDefProxy.java @@ -17,9 +17,9 @@ package com.google.gerrit.server.cache.h2; import com.google.common.cache.CacheLoader; import com.google.common.cache.Weigher; import com.google.gerrit.common.Nullable; -import com.google.gerrit.server.cache.CacheSerializer; import com.google.gerrit.server.cache.PersistentCacheDef; import com.google.gerrit.server.cache.h2.H2CacheImpl.ValueHolder; +import com.google.gerrit.server.cache.serialize.CacheSerializer; import com.google.inject.TypeLiteral; import java.time.Duration; diff --git a/java/com/google/gerrit/server/cache/h2/H2CacheImpl.java b/java/com/google/gerrit/server/cache/h2/H2CacheImpl.java index 562035535b..606fdf0318 100644 --- a/java/com/google/gerrit/server/cache/h2/H2CacheImpl.java +++ b/java/com/google/gerrit/server/cache/h2/H2CacheImpl.java @@ -25,8 +25,8 @@ 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.CacheSerializer; import com.google.gerrit.server.cache.PersistentCache; +import com.google.gerrit.server.cache.serialize.CacheSerializer; import com.google.inject.TypeLiteral; import java.io.IOException; import java.io.InvalidClassException; diff --git a/java/com/google/gerrit/server/cache/h2/ObjectKeyTypeImpl.java b/java/com/google/gerrit/server/cache/h2/ObjectKeyTypeImpl.java index 44e2bb2e98..591883ed70 100644 --- a/java/com/google/gerrit/server/cache/h2/ObjectKeyTypeImpl.java +++ b/java/com/google/gerrit/server/cache/h2/ObjectKeyTypeImpl.java @@ -17,7 +17,7 @@ package com.google.gerrit.server.cache.h2; import com.google.common.hash.Funnel; import com.google.common.hash.Funnels; import com.google.common.hash.PrimitiveSink; -import com.google.gerrit.server.cache.CacheSerializer; +import com.google.gerrit.server.cache.serialize.CacheSerializer; import java.io.IOException; import java.sql.PreparedStatement; import java.sql.ResultSet; diff --git a/java/com/google/gerrit/server/cache/serialize/BUILD b/java/com/google/gerrit/server/cache/serialize/BUILD new file mode 100644 index 0000000000..957a1531db --- /dev/null +++ b/java/com/google/gerrit/server/cache/serialize/BUILD @@ -0,0 +1,12 @@ +java_library( + name = "serialize", + srcs = glob(["*.java"]), + visibility = ["//visibility:public"], + deps = [ + "//java/com/google/gerrit/common:annotations", + "//lib:guava", + "//lib:gwtorm", + "//lib:protobuf", + "//lib/jgit/org.eclipse.jgit:jgit", + ], +) diff --git a/java/com/google/gerrit/server/cache/BooleanCacheSerializer.java b/java/com/google/gerrit/server/cache/serialize/BooleanCacheSerializer.java similarity index 96% rename from java/com/google/gerrit/server/cache/BooleanCacheSerializer.java rename to java/com/google/gerrit/server/cache/serialize/BooleanCacheSerializer.java index 59fc94664b..28cd6eb874 100644 --- a/java/com/google/gerrit/server/cache/BooleanCacheSerializer.java +++ b/java/com/google/gerrit/server/cache/serialize/BooleanCacheSerializer.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.cache; +package com.google.gerrit.server.cache.serialize; import static com.google.common.base.Preconditions.checkNotNull; import static java.nio.charset.StandardCharsets.UTF_8; diff --git a/java/com/google/gerrit/server/cache/CacheSerializer.java b/java/com/google/gerrit/server/cache/serialize/CacheSerializer.java similarity index 96% rename from java/com/google/gerrit/server/cache/CacheSerializer.java rename to java/com/google/gerrit/server/cache/serialize/CacheSerializer.java index 08deecda21..2d41f2c50b 100644 --- a/java/com/google/gerrit/server/cache/CacheSerializer.java +++ b/java/com/google/gerrit/server/cache/serialize/CacheSerializer.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.cache; +package com.google.gerrit.server.cache.serialize; /** * Interface for serializing/deserializing a type to/from a persistent cache. diff --git a/java/com/google/gerrit/server/cache/EnumCacheSerializer.java b/java/com/google/gerrit/server/cache/serialize/EnumCacheSerializer.java similarity index 96% rename from java/com/google/gerrit/server/cache/EnumCacheSerializer.java rename to java/com/google/gerrit/server/cache/serialize/EnumCacheSerializer.java index c5be783356..7856e55e8e 100644 --- a/java/com/google/gerrit/server/cache/EnumCacheSerializer.java +++ b/java/com/google/gerrit/server/cache/serialize/EnumCacheSerializer.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.cache; +package com.google.gerrit.server.cache.serialize; import static com.google.common.base.Preconditions.checkNotNull; import static java.nio.charset.StandardCharsets.UTF_8; diff --git a/java/com/google/gerrit/server/cache/IntKeyCacheSerializer.java b/java/com/google/gerrit/server/cache/serialize/IntKeyCacheSerializer.java similarity index 96% rename from java/com/google/gerrit/server/cache/IntKeyCacheSerializer.java rename to java/com/google/gerrit/server/cache/serialize/IntKeyCacheSerializer.java index a07c004097..cff8682451 100644 --- a/java/com/google/gerrit/server/cache/IntKeyCacheSerializer.java +++ b/java/com/google/gerrit/server/cache/serialize/IntKeyCacheSerializer.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.cache; +package com.google.gerrit.server.cache.serialize; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/java/com/google/gerrit/server/cache/IntegerCacheSerializer.java b/java/com/google/gerrit/server/cache/serialize/IntegerCacheSerializer.java similarity index 97% rename from java/com/google/gerrit/server/cache/IntegerCacheSerializer.java rename to java/com/google/gerrit/server/cache/serialize/IntegerCacheSerializer.java index 5eddb7122c..31959411d8 100644 --- a/java/com/google/gerrit/server/cache/IntegerCacheSerializer.java +++ b/java/com/google/gerrit/server/cache/serialize/IntegerCacheSerializer.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.cache; +package com.google.gerrit.server.cache.serialize; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/java/com/google/gerrit/server/cache/JavaCacheSerializer.java b/java/com/google/gerrit/server/cache/serialize/JavaCacheSerializer.java similarity index 97% rename from java/com/google/gerrit/server/cache/JavaCacheSerializer.java rename to java/com/google/gerrit/server/cache/serialize/JavaCacheSerializer.java index 55358bc4e2..ee718462f7 100644 --- a/java/com/google/gerrit/server/cache/JavaCacheSerializer.java +++ b/java/com/google/gerrit/server/cache/serialize/JavaCacheSerializer.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.cache; +package com.google.gerrit.server.cache.serialize; import com.google.gerrit.common.Nullable; import java.io.ByteArrayInputStream; diff --git a/java/com/google/gerrit/server/cache/ProtoCacheSerializers.java b/java/com/google/gerrit/server/cache/serialize/ProtoCacheSerializers.java similarity index 98% rename from java/com/google/gerrit/server/cache/ProtoCacheSerializers.java rename to java/com/google/gerrit/server/cache/serialize/ProtoCacheSerializers.java index c6fc0b91b0..4e0b1066c0 100644 --- a/java/com/google/gerrit/server/cache/ProtoCacheSerializers.java +++ b/java/com/google/gerrit/server/cache/serialize/ProtoCacheSerializers.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.cache; +package com.google.gerrit.server.cache.serialize; import static com.google.common.base.Preconditions.checkArgument; import static org.eclipse.jgit.lib.Constants.OBJECT_ID_LENGTH; diff --git a/java/com/google/gerrit/server/cache/StringCacheSerializer.java b/java/com/google/gerrit/server/cache/serialize/StringCacheSerializer.java similarity index 97% rename from java/com/google/gerrit/server/cache/StringCacheSerializer.java rename to java/com/google/gerrit/server/cache/serialize/StringCacheSerializer.java index ddf1adeae5..525b75b2c0 100644 --- a/java/com/google/gerrit/server/cache/StringCacheSerializer.java +++ b/java/com/google/gerrit/server/cache/serialize/StringCacheSerializer.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.cache; +package com.google.gerrit.server.cache.serialize; import static java.nio.charset.StandardCharsets.UTF_8; diff --git a/java/com/google/gerrit/server/cache/testing/BUILD b/java/com/google/gerrit/server/cache/testing/BUILD index ed412afca3..9a9f1efed5 100644 --- a/java/com/google/gerrit/server/cache/testing/BUILD +++ b/java/com/google/gerrit/server/cache/testing/BUILD @@ -5,6 +5,7 @@ java_library( srcs = glob(["*.java"]), visibility = ["//visibility:public"], deps = [ + "//java/com/google/gerrit/server/cache/serialize", "//lib:guava", "//lib:protobuf", "//lib/commons:lang3", diff --git a/java/com/google/gerrit/server/change/ChangeKindCacheImpl.java b/java/com/google/gerrit/server/change/ChangeKindCacheImpl.java index 24685af297..a6786d86f0 100644 --- a/java/com/google/gerrit/server/change/ChangeKindCacheImpl.java +++ b/java/com/google/gerrit/server/change/ChangeKindCacheImpl.java @@ -29,11 +29,11 @@ import com.google.gerrit.reviewdb.client.PatchSet; import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.reviewdb.server.ReviewDb; import com.google.gerrit.server.cache.CacheModule; -import com.google.gerrit.server.cache.CacheSerializer; -import com.google.gerrit.server.cache.EnumCacheSerializer; -import com.google.gerrit.server.cache.ProtoCacheSerializers; -import com.google.gerrit.server.cache.ProtoCacheSerializers.ObjectIdConverter; import com.google.gerrit.server.cache.proto.Cache.ChangeKindKeyProto; +import com.google.gerrit.server.cache.serialize.CacheSerializer; +import com.google.gerrit.server.cache.serialize.EnumCacheSerializer; +import com.google.gerrit.server.cache.serialize.ProtoCacheSerializers; +import com.google.gerrit.server.cache.serialize.ProtoCacheSerializers.ObjectIdConverter; import com.google.gerrit.server.config.GerritServerConfig; import com.google.gerrit.server.git.GitRepositoryManager; import com.google.gerrit.server.git.InMemoryInserter; diff --git a/java/com/google/gerrit/server/change/MergeabilityCacheImpl.java b/java/com/google/gerrit/server/change/MergeabilityCacheImpl.java index ba54361488..2d00886968 100644 --- a/java/com/google/gerrit/server/change/MergeabilityCacheImpl.java +++ b/java/com/google/gerrit/server/change/MergeabilityCacheImpl.java @@ -26,12 +26,12 @@ import com.google.common.flogger.FluentLogger; import com.google.common.util.concurrent.UncheckedExecutionException; import com.google.gerrit.extensions.client.SubmitType; import com.google.gerrit.reviewdb.client.Branch; -import com.google.gerrit.server.cache.BooleanCacheSerializer; import com.google.gerrit.server.cache.CacheModule; -import com.google.gerrit.server.cache.CacheSerializer; -import com.google.gerrit.server.cache.ProtoCacheSerializers; -import com.google.gerrit.server.cache.ProtoCacheSerializers.ObjectIdConverter; import com.google.gerrit.server.cache.proto.Cache.MergeabilityKeyProto; +import com.google.gerrit.server.cache.serialize.BooleanCacheSerializer; +import com.google.gerrit.server.cache.serialize.CacheSerializer; +import com.google.gerrit.server.cache.serialize.ProtoCacheSerializers; +import com.google.gerrit.server.cache.serialize.ProtoCacheSerializers.ObjectIdConverter; import com.google.gerrit.server.git.CodeReviewCommit; import com.google.gerrit.server.git.CodeReviewCommit.CodeReviewRevWalk; import com.google.gerrit.server.submit.SubmitDryRun; diff --git a/java/com/google/gerrit/server/git/TagCache.java b/java/com/google/gerrit/server/git/TagCache.java index 3c64674eaf..535644d8f8 100644 --- a/java/com/google/gerrit/server/git/TagCache.java +++ b/java/com/google/gerrit/server/git/TagCache.java @@ -17,7 +17,7 @@ package com.google.gerrit.server.git; import com.google.common.cache.Cache; import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.server.cache.CacheModule; -import com.google.gerrit.server.cache.StringCacheSerializer; +import com.google.gerrit.server.cache.serialize.StringCacheSerializer; import com.google.inject.Inject; import com.google.inject.Module; import com.google.inject.Singleton; diff --git a/java/com/google/gerrit/server/git/TagSet.java b/java/com/google/gerrit/server/git/TagSet.java index 916a64a427..ce8814f849 100644 --- a/java/com/google/gerrit/server/git/TagSet.java +++ b/java/com/google/gerrit/server/git/TagSet.java @@ -21,10 +21,10 @@ import com.google.common.flogger.FluentLogger; import com.google.gerrit.reviewdb.client.PatchSet; import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.reviewdb.client.RefNames; -import com.google.gerrit.server.cache.ProtoCacheSerializers.ObjectIdConverter; import com.google.gerrit.server.cache.proto.Cache.TagSetHolderProto.TagSetProto; import com.google.gerrit.server.cache.proto.Cache.TagSetHolderProto.TagSetProto.CachedRefProto; import com.google.gerrit.server.cache.proto.Cache.TagSetHolderProto.TagSetProto.TagProto; +import com.google.gerrit.server.cache.serialize.ProtoCacheSerializers.ObjectIdConverter; import com.google.protobuf.ByteString; import java.io.IOException; import java.util.BitSet; diff --git a/java/com/google/gerrit/server/git/TagSetHolder.java b/java/com/google/gerrit/server/git/TagSetHolder.java index 0790a36d6b..4c0c035e02 100644 --- a/java/com/google/gerrit/server/git/TagSetHolder.java +++ b/java/com/google/gerrit/server/git/TagSetHolder.java @@ -18,9 +18,9 @@ import static java.util.stream.Collectors.toList; import com.google.gerrit.common.Nullable; import com.google.gerrit.reviewdb.client.Project; -import com.google.gerrit.server.cache.CacheSerializer; -import com.google.gerrit.server.cache.ProtoCacheSerializers; import com.google.gerrit.server.cache.proto.Cache.TagSetHolderProto; +import com.google.gerrit.server.cache.serialize.CacheSerializer; +import com.google.gerrit.server.cache.serialize.ProtoCacheSerializers; import java.util.Collection; import org.eclipse.jgit.lib.Ref; import org.eclipse.jgit.lib.Repository; diff --git a/java/com/google/gerrit/server/notedb/ChangeNotesCache.java b/java/com/google/gerrit/server/notedb/ChangeNotesCache.java index f0187edb08..41f4ed293e 100644 --- a/java/com/google/gerrit/server/notedb/ChangeNotesCache.java +++ b/java/com/google/gerrit/server/notedb/ChangeNotesCache.java @@ -25,10 +25,10 @@ import com.google.gerrit.reviewdb.client.RefNames; import com.google.gerrit.server.ReviewerByEmailSet; import com.google.gerrit.server.ReviewerSet; import com.google.gerrit.server.cache.CacheModule; -import com.google.gerrit.server.cache.CacheSerializer; -import com.google.gerrit.server.cache.ProtoCacheSerializers; -import com.google.gerrit.server.cache.ProtoCacheSerializers.ObjectIdConverter; import com.google.gerrit.server.cache.proto.Cache.ChangeNotesKeyProto; +import com.google.gerrit.server.cache.serialize.CacheSerializer; +import com.google.gerrit.server.cache.serialize.ProtoCacheSerializers; +import com.google.gerrit.server.cache.serialize.ProtoCacheSerializers.ObjectIdConverter; import com.google.gerrit.server.notedb.AbstractChangeNotes.Args; import com.google.gerrit.server.notedb.ChangeNotesCommit.ChangeNotesRevWalk; import com.google.inject.Inject; diff --git a/java/com/google/gerrit/server/notedb/ChangeNotesState.java b/java/com/google/gerrit/server/notedb/ChangeNotesState.java index 11d6880d8d..c51aec36ac 100644 --- a/java/com/google/gerrit/server/notedb/ChangeNotesState.java +++ b/java/com/google/gerrit/server/notedb/ChangeNotesState.java @@ -23,7 +23,7 @@ import static com.google.common.collect.ImmutableSet.toImmutableSet; import static com.google.gerrit.reviewdb.server.ReviewDbCodecs.APPROVAL_CODEC; import static com.google.gerrit.reviewdb.server.ReviewDbCodecs.MESSAGE_CODEC; import static com.google.gerrit.reviewdb.server.ReviewDbCodecs.PATCH_SET_CODEC; -import static com.google.gerrit.server.cache.ProtoCacheSerializers.toByteString; +import static com.google.gerrit.server.cache.serialize.ProtoCacheSerializers.toByteString; import com.google.auto.value.AutoValue; import com.google.common.annotations.VisibleForTesting; @@ -53,14 +53,14 @@ import com.google.gerrit.server.OutputFormat; import com.google.gerrit.server.ReviewerByEmailSet; import com.google.gerrit.server.ReviewerSet; import com.google.gerrit.server.ReviewerStatusUpdate; -import com.google.gerrit.server.cache.CacheSerializer; -import com.google.gerrit.server.cache.ProtoCacheSerializers; -import com.google.gerrit.server.cache.ProtoCacheSerializers.ObjectIdConverter; import com.google.gerrit.server.cache.proto.Cache.ChangeNotesStateProto; import com.google.gerrit.server.cache.proto.Cache.ChangeNotesStateProto.ChangeColumnsProto; import com.google.gerrit.server.cache.proto.Cache.ChangeNotesStateProto.ReviewerByEmailSetEntryProto; import com.google.gerrit.server.cache.proto.Cache.ChangeNotesStateProto.ReviewerSetEntryProto; import com.google.gerrit.server.cache.proto.Cache.ChangeNotesStateProto.ReviewerStatusUpdateProto; +import com.google.gerrit.server.cache.serialize.CacheSerializer; +import com.google.gerrit.server.cache.serialize.ProtoCacheSerializers; +import com.google.gerrit.server.cache.serialize.ProtoCacheSerializers.ObjectIdConverter; import com.google.gerrit.server.index.change.ChangeField.StoredSubmitRecord; import com.google.gerrit.server.notedb.NoteDbChangeState.PrimaryStorage; import com.google.gson.Gson; diff --git a/java/com/google/gerrit/server/query/change/ConflictKey.java b/java/com/google/gerrit/server/query/change/ConflictKey.java index 52904f73e3..42f5b13314 100644 --- a/java/com/google/gerrit/server/query/change/ConflictKey.java +++ b/java/com/google/gerrit/server/query/change/ConflictKey.java @@ -20,10 +20,10 @@ import com.google.common.base.Converter; import com.google.common.base.Enums; import com.google.common.collect.Ordering; import com.google.gerrit.extensions.client.SubmitType; -import com.google.gerrit.server.cache.CacheSerializer; -import com.google.gerrit.server.cache.ProtoCacheSerializers; -import com.google.gerrit.server.cache.ProtoCacheSerializers.ObjectIdConverter; import com.google.gerrit.server.cache.proto.Cache.ConflictKeyProto; +import com.google.gerrit.server.cache.serialize.CacheSerializer; +import com.google.gerrit.server.cache.serialize.ProtoCacheSerializers; +import com.google.gerrit.server.cache.serialize.ProtoCacheSerializers.ObjectIdConverter; import org.eclipse.jgit.lib.AnyObjectId; import org.eclipse.jgit.lib.ObjectId; diff --git a/java/com/google/gerrit/server/query/change/ConflictsCacheImpl.java b/java/com/google/gerrit/server/query/change/ConflictsCacheImpl.java index 0b8c5ee3c9..426c5d6b89 100644 --- a/java/com/google/gerrit/server/query/change/ConflictsCacheImpl.java +++ b/java/com/google/gerrit/server/query/change/ConflictsCacheImpl.java @@ -15,8 +15,8 @@ package com.google.gerrit.server.query.change; import com.google.common.cache.Cache; -import com.google.gerrit.server.cache.BooleanCacheSerializer; import com.google.gerrit.server.cache.CacheModule; +import com.google.gerrit.server.cache.serialize.BooleanCacheSerializer; import com.google.inject.Inject; import com.google.inject.Module; import com.google.inject.Singleton; diff --git a/javatests/com/google/gerrit/server/BUILD b/javatests/com/google/gerrit/server/BUILD index 8394fecb66..b413481ee0 100644 --- a/javatests/com/google/gerrit/server/BUILD +++ b/javatests/com/google/gerrit/server/BUILD @@ -45,6 +45,7 @@ junit_tests( "//java/com/google/gerrit/metrics", "//java/com/google/gerrit/reviewdb:server", "//java/com/google/gerrit/server", + "//java/com/google/gerrit/server/cache/serialize", "//java/com/google/gerrit/server/cache/testing", "//java/com/google/gerrit/server/group/testing", "//java/com/google/gerrit/server/ioutil", diff --git a/javatests/com/google/gerrit/server/auth/oauth/OAuthTokenCacheTest.java b/javatests/com/google/gerrit/server/auth/oauth/OAuthTokenCacheTest.java index 5e93a09a13..81fd6d7157 100644 --- a/javatests/com/google/gerrit/server/auth/oauth/OAuthTokenCacheTest.java +++ b/javatests/com/google/gerrit/server/auth/oauth/OAuthTokenCacheTest.java @@ -6,8 +6,8 @@ import static com.google.gerrit.server.cache.testing.SerializedClassSubject.asse import com.google.common.collect.ImmutableMap; import com.google.gerrit.extensions.auth.oauth.OAuthToken; -import com.google.gerrit.server.cache.CacheSerializer; import com.google.gerrit.server.cache.proto.Cache.OAuthTokenProto; +import com.google.gerrit.server.cache.serialize.CacheSerializer; import java.lang.reflect.Type; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/javatests/com/google/gerrit/server/cache/BUILD b/javatests/com/google/gerrit/server/cache/BUILD index ab881691a4..495026615b 100644 --- a/javatests/com/google/gerrit/server/cache/BUILD +++ b/javatests/com/google/gerrit/server/cache/BUILD @@ -5,16 +5,7 @@ junit_tests( srcs = glob(["*.java"]), deps = [ "//java/com/google/gerrit/server", - "//java/com/google/gerrit/server/cache/testing", - "//lib:guava", - "//lib:gwtorm", "//lib:junit", - "//lib:protobuf", - "//lib/auto:auto-value", - "//lib/auto:auto-value-annotations", - "//lib/jgit/org.eclipse.jgit:jgit", "//lib/truth", - "//lib/truth:truth-proto-extension", - "//proto:cache_java_proto", ], ) diff --git a/javatests/com/google/gerrit/server/cache/h2/BUILD b/javatests/com/google/gerrit/server/cache/h2/BUILD index 63ae94bc12..2ee8e48c05 100644 --- a/javatests/com/google/gerrit/server/cache/h2/BUILD +++ b/javatests/com/google/gerrit/server/cache/h2/BUILD @@ -6,6 +6,7 @@ junit_tests( deps = [ "//java/com/google/gerrit/server", "//java/com/google/gerrit/server/cache/h2", + "//java/com/google/gerrit/server/cache/serialize", "//lib:guava", "//lib:h2", "//lib:junit", diff --git a/javatests/com/google/gerrit/server/cache/h2/H2CacheTest.java b/javatests/com/google/gerrit/server/cache/h2/H2CacheTest.java index 97d123cb50..147aeeb58c 100644 --- a/javatests/com/google/gerrit/server/cache/h2/H2CacheTest.java +++ b/javatests/com/google/gerrit/server/cache/h2/H2CacheTest.java @@ -19,9 +19,9 @@ import static com.google.common.truth.Truth.assertThat; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; import com.google.common.util.concurrent.MoreExecutors; -import com.google.gerrit.server.cache.StringCacheSerializer; import com.google.gerrit.server.cache.h2.H2CacheImpl.SqlStore; import com.google.gerrit.server.cache.h2.H2CacheImpl.ValueHolder; +import com.google.gerrit.server.cache.serialize.StringCacheSerializer; import com.google.inject.TypeLiteral; import java.util.concurrent.ExecutionException; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/javatests/com/google/gerrit/server/cache/serialize/BUILD b/javatests/com/google/gerrit/server/cache/serialize/BUILD new file mode 100644 index 0000000000..35d8527c72 --- /dev/null +++ b/javatests/com/google/gerrit/server/cache/serialize/BUILD @@ -0,0 +1,20 @@ +load("//tools/bzl:junit.bzl", "junit_tests") + +junit_tests( + name = "tests", + srcs = glob(["*.java"]), + deps = [ + "//java/com/google/gerrit/server/cache/serialize", + "//java/com/google/gerrit/server/cache/testing", + "//lib:guava", + "//lib:gwtorm", + "//lib:junit", + "//lib:protobuf", + "//lib/auto:auto-value", + "//lib/auto:auto-value-annotations", + "//lib/jgit/org.eclipse.jgit:jgit", + "//lib/truth", + "//lib/truth:truth-proto-extension", + "//proto:cache_java_proto", + ], +) diff --git a/javatests/com/google/gerrit/server/cache/BooleanCacheSerializerTest.java b/javatests/com/google/gerrit/server/cache/serialize/BooleanCacheSerializerTest.java similarity index 97% rename from javatests/com/google/gerrit/server/cache/BooleanCacheSerializerTest.java rename to javatests/com/google/gerrit/server/cache/serialize/BooleanCacheSerializerTest.java index 3186620287..75048507b1 100644 --- a/javatests/com/google/gerrit/server/cache/BooleanCacheSerializerTest.java +++ b/javatests/com/google/gerrit/server/cache/serialize/BooleanCacheSerializerTest.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.cache; +package com.google.gerrit.server.cache.serialize; import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assert_; diff --git a/javatests/com/google/gerrit/server/cache/EnumCacheSerializerTest.java b/javatests/com/google/gerrit/server/cache/serialize/EnumCacheSerializerTest.java similarity index 97% rename from javatests/com/google/gerrit/server/cache/EnumCacheSerializerTest.java rename to javatests/com/google/gerrit/server/cache/serialize/EnumCacheSerializerTest.java index 60bbb162c1..0b80fc7bbe 100644 --- a/javatests/com/google/gerrit/server/cache/EnumCacheSerializerTest.java +++ b/javatests/com/google/gerrit/server/cache/serialize/EnumCacheSerializerTest.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.cache; +package com.google.gerrit.server.cache.serialize; import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assert_; diff --git a/javatests/com/google/gerrit/server/cache/IntKeyCacheSerializerTest.java b/javatests/com/google/gerrit/server/cache/serialize/IntKeyCacheSerializerTest.java similarity index 97% rename from javatests/com/google/gerrit/server/cache/IntKeyCacheSerializerTest.java rename to javatests/com/google/gerrit/server/cache/serialize/IntKeyCacheSerializerTest.java index 7a7c27c4e8..987a62a996 100644 --- a/javatests/com/google/gerrit/server/cache/IntKeyCacheSerializerTest.java +++ b/javatests/com/google/gerrit/server/cache/serialize/IntKeyCacheSerializerTest.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.cache; +package com.google.gerrit.server.cache.serialize; import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assert_; diff --git a/javatests/com/google/gerrit/server/cache/IntegerCacheSerializerTest.java b/javatests/com/google/gerrit/server/cache/serialize/IntegerCacheSerializerTest.java similarity index 97% rename from javatests/com/google/gerrit/server/cache/IntegerCacheSerializerTest.java rename to javatests/com/google/gerrit/server/cache/serialize/IntegerCacheSerializerTest.java index 962b7972ac..c2db8082eb 100644 --- a/javatests/com/google/gerrit/server/cache/IntegerCacheSerializerTest.java +++ b/javatests/com/google/gerrit/server/cache/serialize/IntegerCacheSerializerTest.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.cache; +package com.google.gerrit.server.cache.serialize; import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assert_; diff --git a/javatests/com/google/gerrit/server/cache/JavaCacheSerializerTest.java b/javatests/com/google/gerrit/server/cache/serialize/JavaCacheSerializerTest.java similarity index 96% rename from javatests/com/google/gerrit/server/cache/JavaCacheSerializerTest.java rename to javatests/com/google/gerrit/server/cache/serialize/JavaCacheSerializerTest.java index 41d07b909b..6596730c10 100644 --- a/javatests/com/google/gerrit/server/cache/JavaCacheSerializerTest.java +++ b/javatests/com/google/gerrit/server/cache/serialize/JavaCacheSerializerTest.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.cache; +package com.google.gerrit.server.cache.serialize; import static com.google.common.truth.Truth.assertThat; diff --git a/javatests/com/google/gerrit/server/cache/ProtoCacheSerializersTest.java b/javatests/com/google/gerrit/server/cache/serialize/ProtoCacheSerializersTest.java similarity index 96% rename from javatests/com/google/gerrit/server/cache/ProtoCacheSerializersTest.java rename to javatests/com/google/gerrit/server/cache/serialize/ProtoCacheSerializersTest.java index 8bf9762002..a2210b8584 100644 --- a/javatests/com/google/gerrit/server/cache/ProtoCacheSerializersTest.java +++ b/javatests/com/google/gerrit/server/cache/serialize/ProtoCacheSerializersTest.java @@ -12,16 +12,16 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.cache; +package com.google.gerrit.server.cache.serialize; import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assert_; import static com.google.common.truth.extensions.proto.ProtoTruth.assertThat; import static com.google.gerrit.server.cache.testing.CacheSerializerTestUtil.bytes; -import com.google.gerrit.server.cache.ProtoCacheSerializers.ObjectIdConverter; import com.google.gerrit.server.cache.proto.Cache.ChangeNotesKeyProto; import com.google.gerrit.server.cache.proto.Cache.ChangeNotesStateProto; +import com.google.gerrit.server.cache.serialize.ProtoCacheSerializers.ObjectIdConverter; import com.google.protobuf.ByteString; import org.eclipse.jgit.lib.ObjectId; import org.junit.Test; diff --git a/javatests/com/google/gerrit/server/cache/StringCacheSerializerTest.java b/javatests/com/google/gerrit/server/cache/serialize/StringCacheSerializerTest.java similarity index 97% rename from javatests/com/google/gerrit/server/cache/StringCacheSerializerTest.java rename to javatests/com/google/gerrit/server/cache/serialize/StringCacheSerializerTest.java index 8085499ca8..fa3b7d73ff 100644 --- a/javatests/com/google/gerrit/server/cache/StringCacheSerializerTest.java +++ b/javatests/com/google/gerrit/server/cache/serialize/StringCacheSerializerTest.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.cache; +package com.google.gerrit.server.cache.serialize; import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assert_; diff --git a/javatests/com/google/gerrit/server/change/ChangeKindCacheImplTest.java b/javatests/com/google/gerrit/server/change/ChangeKindCacheImplTest.java index 03e0d4e615..e34a151703 100644 --- a/javatests/com/google/gerrit/server/change/ChangeKindCacheImplTest.java +++ b/javatests/com/google/gerrit/server/change/ChangeKindCacheImplTest.java @@ -20,8 +20,8 @@ import static com.google.gerrit.server.cache.testing.CacheSerializerTestUtil.byt import static com.google.gerrit.server.cache.testing.SerializedClassSubject.assertThatSerializedClass; import com.google.common.collect.ImmutableMap; -import com.google.gerrit.server.cache.CacheSerializer; import com.google.gerrit.server.cache.proto.Cache.ChangeKindKeyProto; +import com.google.gerrit.server.cache.serialize.CacheSerializer; import com.google.gerrit.server.change.ChangeKindCacheImpl.Key; import org.eclipse.jgit.lib.ObjectId; import org.junit.Test; diff --git a/javatests/com/google/gerrit/server/notedb/ChangeNotesStateTest.java b/javatests/com/google/gerrit/server/notedb/ChangeNotesStateTest.java index 574f6accb3..7b41ba3624 100644 --- a/javatests/com/google/gerrit/server/notedb/ChangeNotesStateTest.java +++ b/javatests/com/google/gerrit/server/notedb/ChangeNotesStateTest.java @@ -19,7 +19,7 @@ import static com.google.common.truth.extensions.proto.ProtoTruth.assertThat; import static com.google.gerrit.reviewdb.server.ReviewDbCodecs.APPROVAL_CODEC; import static com.google.gerrit.reviewdb.server.ReviewDbCodecs.MESSAGE_CODEC; import static com.google.gerrit.reviewdb.server.ReviewDbCodecs.PATCH_SET_CODEC; -import static com.google.gerrit.server.cache.ProtoCacheSerializers.toByteString; +import static com.google.gerrit.server.cache.serialize.ProtoCacheSerializers.toByteString; import static com.google.gerrit.server.cache.testing.SerializedClassSubject.assertThatSerializedClass; import com.google.common.collect.ImmutableList; @@ -42,12 +42,12 @@ import com.google.gerrit.reviewdb.client.RevId; import com.google.gerrit.server.ReviewerByEmailSet; import com.google.gerrit.server.ReviewerSet; import com.google.gerrit.server.ReviewerStatusUpdate; -import com.google.gerrit.server.cache.ProtoCacheSerializers.ObjectIdConverter; import com.google.gerrit.server.cache.proto.Cache.ChangeNotesStateProto; import com.google.gerrit.server.cache.proto.Cache.ChangeNotesStateProto.ChangeColumnsProto; import com.google.gerrit.server.cache.proto.Cache.ChangeNotesStateProto.ReviewerByEmailSetEntryProto; import com.google.gerrit.server.cache.proto.Cache.ChangeNotesStateProto.ReviewerSetEntryProto; import com.google.gerrit.server.cache.proto.Cache.ChangeNotesStateProto.ReviewerStatusUpdateProto; +import com.google.gerrit.server.cache.serialize.ProtoCacheSerializers.ObjectIdConverter; import com.google.gerrit.server.notedb.ChangeNotesState.ChangeColumns; import com.google.gerrit.server.notedb.ChangeNotesState.Serializer; import com.google.gwtorm.client.KeyUtil;