diff options
author | Adithya Chakilam <achakila@codeaurora.org> | 2021-11-15 19:04:58 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-11-15 19:04:58 +0000 |
commit | 7c31335361872efa9f02848d3874c8b83ddea580 (patch) | |
tree | 528752d62ff48b2b28708e4afcb798bf2e1bec6d | |
parent | 7af5abd13491c07617d85b8d4fdda6de3b36a83e (diff) | |
parent | 4b119b0c3395f39bd0dfd8e4b12f1b67a28d9ab2 (diff) |
Merge "Move AutoFlush to 'gerrit.server.index.options' package" into stable-3.2
-rw-r--r-- | java/com/google/gerrit/acceptance/GerritServer.java | 2 | ||||
-rw-r--r-- | java/com/google/gerrit/httpd/init/WebAppInitializer.java | 2 | ||||
-rw-r--r-- | java/com/google/gerrit/lucene/AbstractLuceneIndex.java | 2 | ||||
-rw-r--r-- | java/com/google/gerrit/lucene/ChangeSubIndex.java | 2 | ||||
-rw-r--r-- | java/com/google/gerrit/lucene/LuceneAccountIndex.java | 2 | ||||
-rw-r--r-- | java/com/google/gerrit/lucene/LuceneChangeIndex.java | 2 | ||||
-rw-r--r-- | java/com/google/gerrit/lucene/LuceneGroupIndex.java | 2 | ||||
-rw-r--r-- | java/com/google/gerrit/lucene/LuceneIndexModule.java | 2 | ||||
-rw-r--r-- | java/com/google/gerrit/lucene/LuceneProjectIndex.java | 2 | ||||
-rw-r--r-- | java/com/google/gerrit/pgm/Daemon.java | 2 | ||||
-rw-r--r-- | java/com/google/gerrit/pgm/Reindex.java | 2 | ||||
-rw-r--r-- | java/com/google/gerrit/pgm/init/index/lucene/LuceneIndexModuleOnInit.java | 2 | ||||
-rw-r--r-- | java/com/google/gerrit/server/index/options/AutoFlush.java (renamed from java/com/google/gerrit/server/index/AutoFlush.java) | 2 |
13 files changed, 13 insertions, 13 deletions
diff --git a/java/com/google/gerrit/acceptance/GerritServer.java b/java/com/google/gerrit/acceptance/GerritServer.java index 5369e36055..f1598e7dbb 100644 --- a/java/com/google/gerrit/acceptance/GerritServer.java +++ b/java/com/google/gerrit/acceptance/GerritServer.java @@ -45,7 +45,7 @@ import com.google.gerrit.server.config.GerritRuntime; import com.google.gerrit.server.config.GerritServerConfig; import com.google.gerrit.server.config.SitePath; import com.google.gerrit.server.git.receive.AsyncReceiveCommits; -import com.google.gerrit.server.index.AutoFlush; +import com.google.gerrit.server.index.options.AutoFlush; import com.google.gerrit.server.schema.JdbcAccountPatchReviewStore; import com.google.gerrit.server.ssh.NoSshModule; import com.google.gerrit.server.util.ReplicaUtil; diff --git a/java/com/google/gerrit/httpd/init/WebAppInitializer.java b/java/com/google/gerrit/httpd/init/WebAppInitializer.java index 03a244b081..35c33be7df 100644 --- a/java/com/google/gerrit/httpd/init/WebAppInitializer.java +++ b/java/com/google/gerrit/httpd/init/WebAppInitializer.java @@ -76,10 +76,10 @@ import com.google.gerrit.server.git.GitRepositoryManagerModule; import com.google.gerrit.server.git.SearchingChangeCacheImpl; import com.google.gerrit.server.git.SystemReaderInstaller; import com.google.gerrit.server.git.WorkQueue; -import com.google.gerrit.server.index.AutoFlush; import com.google.gerrit.server.index.IndexModule; import com.google.gerrit.server.index.OnlineUpgrader; import com.google.gerrit.server.index.VersionManager; +import com.google.gerrit.server.index.options.AutoFlush; import com.google.gerrit.server.mail.SignedTokenEmailTokenVerifier; import com.google.gerrit.server.mail.receive.MailReceiver; import com.google.gerrit.server.mail.send.SmtpEmailSender; diff --git a/java/com/google/gerrit/lucene/AbstractLuceneIndex.java b/java/com/google/gerrit/lucene/AbstractLuceneIndex.java index 4e76d9b776..1e6ccac89a 100644 --- a/java/com/google/gerrit/lucene/AbstractLuceneIndex.java +++ b/java/com/google/gerrit/lucene/AbstractLuceneIndex.java @@ -44,8 +44,8 @@ import com.google.gerrit.index.query.FieldBundle; import com.google.gerrit.index.query.ListResultSet; import com.google.gerrit.index.query.ResultSet; import com.google.gerrit.server.config.SitePaths; -import com.google.gerrit.server.index.AutoFlush; import com.google.gerrit.server.index.IndexUtils; +import com.google.gerrit.server.index.options.AutoFlush; import com.google.gerrit.server.logging.LoggingContextAwareExecutorService; import com.google.gerrit.server.logging.LoggingContextAwareScheduledExecutorService; import java.io.IOException; diff --git a/java/com/google/gerrit/lucene/ChangeSubIndex.java b/java/com/google/gerrit/lucene/ChangeSubIndex.java index 60edcabea2..5c24b9a009 100644 --- a/java/com/google/gerrit/lucene/ChangeSubIndex.java +++ b/java/com/google/gerrit/lucene/ChangeSubIndex.java @@ -31,9 +31,9 @@ import com.google.gerrit.index.query.FieldBundle; import com.google.gerrit.index.query.Predicate; import com.google.gerrit.index.query.QueryParseException; import com.google.gerrit.server.config.SitePaths; -import com.google.gerrit.server.index.AutoFlush; import com.google.gerrit.server.index.change.ChangeField; import com.google.gerrit.server.index.change.ChangeIndex; +import com.google.gerrit.server.index.options.AutoFlush; import com.google.gerrit.server.query.change.ChangeData; import java.io.IOException; import java.nio.file.Path; diff --git a/java/com/google/gerrit/lucene/LuceneAccountIndex.java b/java/com/google/gerrit/lucene/LuceneAccountIndex.java index 95c6f18e17..87b7ccef6b 100644 --- a/java/com/google/gerrit/lucene/LuceneAccountIndex.java +++ b/java/com/google/gerrit/lucene/LuceneAccountIndex.java @@ -34,9 +34,9 @@ import com.google.gerrit.server.account.AccountCache; import com.google.gerrit.server.account.AccountState; import com.google.gerrit.server.config.GerritServerConfig; import com.google.gerrit.server.config.SitePaths; -import com.google.gerrit.server.index.AutoFlush; import com.google.gerrit.server.index.IndexUtils; import com.google.gerrit.server.index.account.AccountIndex; +import com.google.gerrit.server.index.options.AutoFlush; import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.assistedinject.Assisted; diff --git a/java/com/google/gerrit/lucene/LuceneChangeIndex.java b/java/com/google/gerrit/lucene/LuceneChangeIndex.java index 286815e8c3..bb97936bad 100644 --- a/java/com/google/gerrit/lucene/LuceneChangeIndex.java +++ b/java/com/google/gerrit/lucene/LuceneChangeIndex.java @@ -59,12 +59,12 @@ import com.google.gerrit.server.StarredChangesUtil; import com.google.gerrit.server.change.MergeabilityComputationBehavior; import com.google.gerrit.server.config.GerritServerConfig; import com.google.gerrit.server.config.SitePaths; -import com.google.gerrit.server.index.AutoFlush; import com.google.gerrit.server.index.IndexExecutor; import com.google.gerrit.server.index.IndexUtils; import com.google.gerrit.server.index.change.ChangeField; import com.google.gerrit.server.index.change.ChangeIndex; import com.google.gerrit.server.index.change.ChangeIndexRewriter; +import com.google.gerrit.server.index.options.AutoFlush; import com.google.gerrit.server.project.SubmitRuleOptions; import com.google.gerrit.server.query.change.ChangeData; import com.google.gerrit.server.query.change.ChangeDataSource; diff --git a/java/com/google/gerrit/lucene/LuceneGroupIndex.java b/java/com/google/gerrit/lucene/LuceneGroupIndex.java index b61d0fb14b..c1b44c7829 100644 --- a/java/com/google/gerrit/lucene/LuceneGroupIndex.java +++ b/java/com/google/gerrit/lucene/LuceneGroupIndex.java @@ -31,9 +31,9 @@ import com.google.gerrit.server.account.GroupCache; import com.google.gerrit.server.config.GerritServerConfig; import com.google.gerrit.server.config.SitePaths; import com.google.gerrit.server.group.InternalGroup; -import com.google.gerrit.server.index.AutoFlush; import com.google.gerrit.server.index.IndexUtils; import com.google.gerrit.server.index.group.GroupIndex; +import com.google.gerrit.server.index.options.AutoFlush; import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.assistedinject.Assisted; diff --git a/java/com/google/gerrit/lucene/LuceneIndexModule.java b/java/com/google/gerrit/lucene/LuceneIndexModule.java index 16fd87f5bc..73256b1171 100644 --- a/java/com/google/gerrit/lucene/LuceneIndexModule.java +++ b/java/com/google/gerrit/lucene/LuceneIndexModule.java @@ -20,11 +20,11 @@ import com.google.gerrit.index.IndexConfig; import com.google.gerrit.index.project.ProjectIndex; import com.google.gerrit.server.config.GerritServerConfig; import com.google.gerrit.server.index.AbstractIndexModule; -import com.google.gerrit.server.index.AutoFlush; import com.google.gerrit.server.index.VersionManager; import com.google.gerrit.server.index.account.AccountIndex; import com.google.gerrit.server.index.change.ChangeIndex; import com.google.gerrit.server.index.group.GroupIndex; +import com.google.gerrit.server.index.options.AutoFlush; import java.util.Map; import org.apache.lucene.search.BooleanQuery; import org.eclipse.jgit.lib.Config; diff --git a/java/com/google/gerrit/lucene/LuceneProjectIndex.java b/java/com/google/gerrit/lucene/LuceneProjectIndex.java index ef6e0fdd35..7e7aecb923 100644 --- a/java/com/google/gerrit/lucene/LuceneProjectIndex.java +++ b/java/com/google/gerrit/lucene/LuceneProjectIndex.java @@ -31,8 +31,8 @@ import com.google.gerrit.index.query.Predicate; import com.google.gerrit.index.query.QueryParseException; import com.google.gerrit.server.config.GerritServerConfig; import com.google.gerrit.server.config.SitePaths; -import com.google.gerrit.server.index.AutoFlush; import com.google.gerrit.server.index.IndexUtils; +import com.google.gerrit.server.index.options.AutoFlush; import com.google.gerrit.server.project.ProjectCache; import com.google.gerrit.server.project.ProjectState; import com.google.inject.Inject; diff --git a/java/com/google/gerrit/pgm/Daemon.java b/java/com/google/gerrit/pgm/Daemon.java index 692e2e0d35..449a868d2d 100644 --- a/java/com/google/gerrit/pgm/Daemon.java +++ b/java/com/google/gerrit/pgm/Daemon.java @@ -84,10 +84,10 @@ import com.google.gerrit.server.git.GarbageCollectionModule; import com.google.gerrit.server.git.SearchingChangeCacheImpl; import com.google.gerrit.server.git.WorkQueue; import com.google.gerrit.server.group.PeriodicGroupIndexer; -import com.google.gerrit.server.index.AutoFlush; import com.google.gerrit.server.index.IndexModule; import com.google.gerrit.server.index.OnlineUpgrader; import com.google.gerrit.server.index.VersionManager; +import com.google.gerrit.server.index.options.AutoFlush; import com.google.gerrit.server.mail.SignedTokenEmailTokenVerifier; import com.google.gerrit.server.mail.receive.MailReceiver; import com.google.gerrit.server.mail.send.SmtpEmailSender; diff --git a/java/com/google/gerrit/pgm/Reindex.java b/java/com/google/gerrit/pgm/Reindex.java index 923406ea1a..30f6d4d7e7 100644 --- a/java/com/google/gerrit/pgm/Reindex.java +++ b/java/com/google/gerrit/pgm/Reindex.java @@ -31,9 +31,9 @@ import com.google.gerrit.pgm.util.BatchProgramModule; import com.google.gerrit.pgm.util.SiteProgram; import com.google.gerrit.server.change.ChangeResource; import com.google.gerrit.server.config.GerritServerConfig; -import com.google.gerrit.server.index.AutoFlush; import com.google.gerrit.server.index.IndexModule; import com.google.gerrit.server.index.change.ChangeSchemaDefinitions; +import com.google.gerrit.server.index.options.AutoFlush; import com.google.gerrit.server.plugins.PluginGuiceEnvironment; import com.google.gerrit.server.util.ReplicaUtil; import com.google.inject.Inject; diff --git a/java/com/google/gerrit/pgm/init/index/lucene/LuceneIndexModuleOnInit.java b/java/com/google/gerrit/pgm/init/index/lucene/LuceneIndexModuleOnInit.java index 54618a19e5..078e6488d8 100644 --- a/java/com/google/gerrit/pgm/init/index/lucene/LuceneIndexModuleOnInit.java +++ b/java/com/google/gerrit/pgm/init/index/lucene/LuceneIndexModuleOnInit.java @@ -17,9 +17,9 @@ package com.google.gerrit.pgm.init.index.lucene; import com.google.gerrit.lucene.LuceneAccountIndex; import com.google.gerrit.lucene.LuceneGroupIndex; import com.google.gerrit.pgm.init.index.IndexModuleOnInit; -import com.google.gerrit.server.index.AutoFlush; import com.google.gerrit.server.index.account.AccountIndex; import com.google.gerrit.server.index.group.GroupIndex; +import com.google.gerrit.server.index.options.AutoFlush; import com.google.inject.AbstractModule; import com.google.inject.assistedinject.FactoryModuleBuilder; diff --git a/java/com/google/gerrit/server/index/AutoFlush.java b/java/com/google/gerrit/server/index/options/AutoFlush.java index 3d131105dd..7b82edb430 100644 --- a/java/com/google/gerrit/server/index/AutoFlush.java +++ b/java/com/google/gerrit/server/index/options/AutoFlush.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.server.index; +package com.google.gerrit.server.index.options; public enum AutoFlush { ENABLED, |