From 9c491e835551555059bda0095a24fbf28fa3150a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20Ar=C3=A8s?= Date: Mon, 14 Nov 2016 17:05:13 -0800 Subject: [PATCH] Remove gerrit-index folder Most of the index abstraction classes were already in gerrit-server except 3 classes that were recently added in gerrit-index. Change-Id: Id7360ff70bef377c27c9cad9a591a63e72728a61 --- gerrit-elasticsearch/BUCK | 1 - gerrit-elasticsearch/BUILD | 1 - .../gerrit/elasticsearch/AbstractElasticIndex.java | 2 +- .../gerrit/elasticsearch/ElasticChangeIndex.java | 2 +- .../gerrit/elasticsearch/ElasticIndexModule.java | 2 +- gerrit-index/BUCK | 13 ------------- gerrit-index/BUILD | 13 ------------- gerrit-lucene/BUCK | 1 - gerrit-lucene/BUILD | 1 - .../google/gerrit/lucene/AbstractLuceneIndex.java | 2 +- .../com/google/gerrit/lucene/LuceneChangeIndex.java | 2 +- .../com/google/gerrit/lucene/LuceneIndexModule.java | 2 +- .../google/gerrit/lucene/LuceneVersionManager.java | 2 +- gerrit-pgm/BUCK | 1 - gerrit-pgm/BUILD | 1 - .../java/com/google/gerrit/pgm/init/InitIndex.java | 2 +- .../gerrit/server}/index/GerritIndexStatus.java | 2 +- .../com/google/gerrit/server}/index/IndexUtils.java | 3 +-- .../gerrit/server}/index/SingleVersionModule.java | 5 +---- 19 files changed, 11 insertions(+), 47 deletions(-) delete mode 100644 gerrit-index/BUCK delete mode 100644 gerrit-index/BUILD rename {gerrit-index/src/main/java/com/google/gerrit => gerrit-server/src/main/java/com/google/gerrit/server}/index/GerritIndexStatus.java (98%) rename {gerrit-index/src/main/java/com/google/gerrit => gerrit-server/src/main/java/com/google/gerrit/server}/index/IndexUtils.java (96%) rename {gerrit-index/src/main/java/com/google/gerrit => gerrit-server/src/main/java/com/google/gerrit/server}/index/SingleVersionModule.java (94%) diff --git a/gerrit-elasticsearch/BUCK b/gerrit-elasticsearch/BUCK index a16ad5004f..83f373ff28 100644 --- a/gerrit-elasticsearch/BUCK +++ b/gerrit-elasticsearch/BUCK @@ -8,7 +8,6 @@ java_library( '//gerrit-reviewdb:client', '//gerrit-reviewdb:server', '//gerrit-server:server', - '//gerrit-index:index', '//lib:gson', '//lib:guava', '//lib:gwtorm', diff --git a/gerrit-elasticsearch/BUILD b/gerrit-elasticsearch/BUILD index 81009d1d86..915f461f21 100644 --- a/gerrit-elasticsearch/BUILD +++ b/gerrit-elasticsearch/BUILD @@ -8,7 +8,6 @@ java_library( '//gerrit-reviewdb:client', '//gerrit-reviewdb:server', '//gerrit-server:server', - '//gerrit-index:index', '//lib:gson', '//lib:guava', '//lib:gwtorm', diff --git a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/AbstractElasticIndex.java b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/AbstractElasticIndex.java index a46edc77be..9ca07c2f51 100644 --- a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/AbstractElasticIndex.java +++ b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/AbstractElasticIndex.java @@ -20,11 +20,11 @@ import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; import com.google.common.base.Strings; import com.google.common.collect.Iterables; -import com.google.gerrit.index.IndexUtils; import com.google.gerrit.server.config.GerritServerConfig; import com.google.gerrit.server.config.SitePaths; import com.google.gerrit.server.index.FieldDef.FillArgs; import com.google.gerrit.server.index.Index; +import com.google.gerrit.server.index.IndexUtils; import com.google.gerrit.server.index.Schema; import com.google.gerrit.server.index.Schema.Values; import com.google.inject.Inject; diff --git a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticChangeIndex.java b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticChangeIndex.java index dd272fac55..2ba7b58e78 100644 --- a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticChangeIndex.java +++ b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticChangeIndex.java @@ -26,7 +26,6 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; import com.google.common.collect.Sets; import com.google.gerrit.elasticsearch.ElasticMapping.MappingProperties; -import com.google.gerrit.index.IndexUtils; import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.reviewdb.client.Change; import com.google.gerrit.reviewdb.client.Change.Id; @@ -38,6 +37,7 @@ import com.google.gerrit.server.config.SitePaths; import com.google.gerrit.server.index.FieldDef; import com.google.gerrit.server.index.FieldDef.FillArgs; import com.google.gerrit.server.index.FieldType; +import com.google.gerrit.server.index.IndexUtils; import com.google.gerrit.server.index.QueryOptions; import com.google.gerrit.server.index.Schema; import com.google.gerrit.server.index.change.ChangeField; diff --git a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticIndexModule.java b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticIndexModule.java index e108dcab19..3c0a5fd733 100644 --- a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticIndexModule.java +++ b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticIndexModule.java @@ -14,12 +14,12 @@ package com.google.gerrit.elasticsearch; -import com.google.gerrit.index.SingleVersionModule; import com.google.gerrit.lifecycle.LifecycleModule; import com.google.gerrit.lucene.LuceneAccountIndex; import com.google.gerrit.server.config.GerritServerConfig; import com.google.gerrit.server.index.IndexConfig; import com.google.gerrit.server.index.IndexModule; +import com.google.gerrit.server.index.SingleVersionModule; import com.google.gerrit.server.index.account.AccountIndex; import com.google.gerrit.server.index.change.ChangeIndex; import com.google.inject.Provides; diff --git a/gerrit-index/BUCK b/gerrit-index/BUCK deleted file mode 100644 index ea97f88202..0000000000 --- a/gerrit-index/BUCK +++ /dev/null @@ -1,13 +0,0 @@ -java_library( - name = 'index', - srcs = glob(['src/main/java/**/*.java']), - deps = [ - '//gerrit-extension-api:api', - '//gerrit-server:server', - '//gerrit-patch-jgit:server', - '//lib/guice:guice', - '//lib/jgit/org.eclipse.jgit:jgit', - '//lib:guava', - ], - visibility = ['PUBLIC'], -) diff --git a/gerrit-index/BUILD b/gerrit-index/BUILD deleted file mode 100644 index 119d5c40b4..0000000000 --- a/gerrit-index/BUILD +++ /dev/null @@ -1,13 +0,0 @@ -java_library( - name = 'index', - srcs = glob(['src/main/java/**/*.java']), - deps = [ - '//gerrit-extension-api:api', - '//gerrit-server:server', - '//gerrit-patch-jgit:server', - '//lib/guice:guice', - '//lib/jgit/org.eclipse.jgit:jgit', - '//lib:guava', - ], - visibility = ['//visibility:public'], -) diff --git a/gerrit-lucene/BUCK b/gerrit-lucene/BUCK index f4f097cd16..771a02171a 100644 --- a/gerrit-lucene/BUCK +++ b/gerrit-lucene/BUCK @@ -27,7 +27,6 @@ java_library( '//gerrit-extension-api:api', '//gerrit-reviewdb:server', '//gerrit-server:server', - '//gerrit-index:index', '//lib:guava', '//lib:gwtorm', '//lib/guice:guice', diff --git a/gerrit-lucene/BUILD b/gerrit-lucene/BUILD index de010ebe4c..2f1cba77eb 100644 --- a/gerrit-lucene/BUILD +++ b/gerrit-lucene/BUILD @@ -25,7 +25,6 @@ java_library( '//gerrit-common:annotations', '//gerrit-common:server', '//gerrit-extension-api:api', - '//gerrit-index:index', '//gerrit-reviewdb:server', '//gerrit-server:server', '//lib:guava', diff --git a/gerrit-lucene/src/main/java/com/google/gerrit/lucene/AbstractLuceneIndex.java b/gerrit-lucene/src/main/java/com/google/gerrit/lucene/AbstractLuceneIndex.java index e869afb148..6237a61b47 100644 --- a/gerrit-lucene/src/main/java/com/google/gerrit/lucene/AbstractLuceneIndex.java +++ b/gerrit-lucene/src/main/java/com/google/gerrit/lucene/AbstractLuceneIndex.java @@ -25,12 +25,12 @@ import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; import com.google.common.util.concurrent.ThreadFactoryBuilder; -import com.google.gerrit.index.IndexUtils; import com.google.gerrit.server.config.SitePaths; import com.google.gerrit.server.index.FieldDef; import com.google.gerrit.server.index.FieldDef.FillArgs; import com.google.gerrit.server.index.FieldType; import com.google.gerrit.server.index.Index; +import com.google.gerrit.server.index.IndexUtils; import com.google.gerrit.server.index.Schema; import com.google.gerrit.server.index.Schema.Values; diff --git a/gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneChangeIndex.java b/gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneChangeIndex.java index 508f11475a..13cd10ddae 100644 --- a/gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneChangeIndex.java +++ b/gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneChangeIndex.java @@ -33,7 +33,6 @@ import com.google.common.collect.Sets; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; -import com.google.gerrit.index.IndexUtils; import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.reviewdb.client.Change; import com.google.gerrit.reviewdb.client.PatchSet; @@ -44,6 +43,7 @@ import com.google.gerrit.server.config.GerritServerConfig; import com.google.gerrit.server.config.SitePaths; import com.google.gerrit.server.index.FieldDef.FillArgs; import com.google.gerrit.server.index.IndexExecutor; +import com.google.gerrit.server.index.IndexUtils; import com.google.gerrit.server.index.QueryOptions; import com.google.gerrit.server.index.Schema; import com.google.gerrit.server.index.change.ChangeField; diff --git a/gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneIndexModule.java b/gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneIndexModule.java index 58890176d7..d23c5bb2bc 100644 --- a/gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneIndexModule.java +++ b/gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneIndexModule.java @@ -15,11 +15,11 @@ package com.google.gerrit.lucene; import com.google.common.collect.ImmutableMap; -import com.google.gerrit.index.SingleVersionModule; import com.google.gerrit.lifecycle.LifecycleModule; import com.google.gerrit.server.config.GerritServerConfig; import com.google.gerrit.server.index.IndexConfig; import com.google.gerrit.server.index.IndexModule; +import com.google.gerrit.server.index.SingleVersionModule; import com.google.gerrit.server.index.account.AccountIndex; import com.google.gerrit.server.index.change.ChangeIndex; import com.google.inject.Provides; diff --git a/gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneVersionManager.java b/gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneVersionManager.java index 9f163b7b4f..e95a1fb51e 100644 --- a/gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneVersionManager.java +++ b/gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneVersionManager.java @@ -20,9 +20,9 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.primitives.Ints; import com.google.gerrit.extensions.events.LifecycleListener; -import com.google.gerrit.index.GerritIndexStatus; import com.google.gerrit.server.config.GerritServerConfig; import com.google.gerrit.server.config.SitePaths; +import com.google.gerrit.server.index.GerritIndexStatus; import com.google.gerrit.server.index.Index; import com.google.gerrit.server.index.IndexCollection; import com.google.gerrit.server.index.IndexDefinition; diff --git a/gerrit-pgm/BUCK b/gerrit-pgm/BUCK index d5abf99ec3..1d0c752115 100644 --- a/gerrit-pgm/BUCK +++ b/gerrit-pgm/BUCK @@ -47,7 +47,6 @@ java_library( ':init-api', ':util', '//gerrit-common:annotations', - '//gerrit-index:index', '//lib:args4j', '//lib:derby', '//lib:gwtjsonrpc', diff --git a/gerrit-pgm/BUILD b/gerrit-pgm/BUILD index 4f2b609abf..eef7dcb07c 100644 --- a/gerrit-pgm/BUILD +++ b/gerrit-pgm/BUILD @@ -45,7 +45,6 @@ java_library( ':init-api', ':util', '//gerrit-common:annotations', - '//gerrit-index:index', '//gerrit-launcher:launcher', # We want this dep to be provided_deps '//gerrit-lucene:lucene', '//lib:args4j', diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitIndex.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitIndex.java index c8d8edb499..c9a9b5c717 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitIndex.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitIndex.java @@ -16,7 +16,6 @@ package com.google.gerrit.pgm.init; import com.google.common.collect.Iterables; import com.google.common.collect.Sets; -import com.google.gerrit.index.IndexUtils; import com.google.gerrit.pgm.init.api.ConsoleUI; import com.google.gerrit.pgm.init.api.InitFlags; import com.google.gerrit.pgm.init.api.InitStep; @@ -24,6 +23,7 @@ import com.google.gerrit.pgm.init.api.Section; import com.google.gerrit.server.config.SitePaths; import com.google.gerrit.server.index.IndexModule; import com.google.gerrit.server.index.IndexModule.IndexType; +import com.google.gerrit.server.index.IndexUtils; import com.google.gerrit.server.index.SchemaDefinitions; import com.google.inject.Inject; import com.google.inject.Singleton; diff --git a/gerrit-index/src/main/java/com/google/gerrit/index/GerritIndexStatus.java b/gerrit-server/src/main/java/com/google/gerrit/server/index/GerritIndexStatus.java similarity index 98% rename from gerrit-index/src/main/java/com/google/gerrit/index/GerritIndexStatus.java rename to gerrit-server/src/main/java/com/google/gerrit/server/index/GerritIndexStatus.java index cafd30e423..57631851cd 100644 --- a/gerrit-index/src/main/java/com/google/gerrit/index/GerritIndexStatus.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/index/GerritIndexStatus.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.index; +package com.google.gerrit.server.index; import com.google.common.primitives.Ints; import com.google.gerrit.server.config.SitePaths; diff --git a/gerrit-index/src/main/java/com/google/gerrit/index/IndexUtils.java b/gerrit-server/src/main/java/com/google/gerrit/server/index/IndexUtils.java similarity index 96% rename from gerrit-index/src/main/java/com/google/gerrit/index/IndexUtils.java rename to gerrit-server/src/main/java/com/google/gerrit/server/index/IndexUtils.java index f00f5c27a5..125968b0ae 100644 --- a/gerrit-index/src/main/java/com/google/gerrit/index/IndexUtils.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/index/IndexUtils.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.index; +package com.google.gerrit.server.index; import static com.google.gerrit.server.index.change.ChangeField.CHANGE; import static com.google.gerrit.server.index.change.ChangeField.LEGACY_ID; @@ -22,7 +22,6 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; import com.google.gerrit.server.config.SitePaths; -import com.google.gerrit.server.index.QueryOptions; import org.eclipse.jgit.errors.ConfigInvalidException; diff --git a/gerrit-index/src/main/java/com/google/gerrit/index/SingleVersionModule.java b/gerrit-server/src/main/java/com/google/gerrit/server/index/SingleVersionModule.java similarity index 94% rename from gerrit-index/src/main/java/com/google/gerrit/index/SingleVersionModule.java rename to gerrit-server/src/main/java/com/google/gerrit/server/index/SingleVersionModule.java index d547b06a2a..f996c3f38b 100644 --- a/gerrit-index/src/main/java/com/google/gerrit/index/SingleVersionModule.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/index/SingleVersionModule.java @@ -12,15 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.index; +package com.google.gerrit.server.index; import com.google.common.collect.ImmutableSet; import com.google.gerrit.extensions.events.LifecycleListener; import com.google.gerrit.lifecycle.LifecycleModule; import com.google.gerrit.server.config.GerritServerConfig; -import com.google.gerrit.server.index.Index; -import com.google.gerrit.server.index.IndexDefinition; -import com.google.gerrit.server.index.Schema; import com.google.inject.Inject; import com.google.inject.ProvisionException; import com.google.inject.Singleton;