opendev/gerrit
Code Issues Proposed changes

BaseInit: Remove SchemaFactory

Browse Source 
Change-Id: Ie6303b85cf0d3286293f48b6489781bfd1ccf6aa
This commit is contained in:
Dave Borowitz
2018-12-15 15:30:15 -08:00
parent 6ecffe51b3
commit 8042cc870d
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
java/com/google/gerrit/pgm/init/BaseInit.java
View File

@@ -33,7 +33,6 @@ import com.google.gerrit.pgm.init.index.IndexManagerOnInit;
import com.google.gerrit.pgm.init.index.elasticsearch.ElasticIndexModuleOnInit; import com.google.gerrit.pgm.init.index.elasticsearch.ElasticIndexModuleOnInit;
import com.google.gerrit.pgm.init.index.lucene.LuceneIndexModuleOnInit; import com.google.gerrit.pgm.init.index.lucene.LuceneIndexModuleOnInit;
import com.google.gerrit.pgm.util.SiteProgram; import com.google.gerrit.pgm.util.SiteProgram;
import com.google.gerrit.reviewdb.server.ReviewDb;
import com.google.gerrit.server.config.GerritServerConfigModule; import com.google.gerrit.server.config.GerritServerConfigModule;
import com.google.gerrit.server.config.SitePath; import com.google.gerrit.server.config.SitePath;
import com.google.gerrit.server.config.SitePaths; import com.google.gerrit.server.config.SitePaths;
@@ -41,13 +40,11 @@ import com.google.gerrit.server.git.GitRepositoryManager;
import com.google.gerrit.server.index.IndexModule; import com.google.gerrit.server.index.IndexModule;
import com.google.gerrit.server.plugins.JarScanner; import com.google.gerrit.server.plugins.JarScanner;
import com.google.gerrit.server.schema.NoteDbSchemaUpdater; import com.google.gerrit.server.schema.NoteDbSchemaUpdater;
import com.google.gerrit.server.schema.ReviewDbFactory;
import com.google.gerrit.server.schema.UpdateUI; import com.google.gerrit.server.schema.UpdateUI;
import com.google.gerrit.server.securestore.SecureStore; import com.google.gerrit.server.securestore.SecureStore;
import com.google.gerrit.server.securestore.SecureStoreClassName; import com.google.gerrit.server.securestore.SecureStoreClassName;
import com.google.gerrit.server.securestore.SecureStoreProvider; import com.google.gerrit.server.securestore.SecureStoreProvider;
import com.google.gwtorm.server.OrmException; import com.google.gwtorm.server.OrmException;
import com.google.gwtorm.server.SchemaFactory;
import com.google.gwtorm.server.StatementExecutor; import com.google.gwtorm.server.StatementExecutor;
import com.google.inject.AbstractModule; import com.google.inject.AbstractModule;
import com.google.inject.CreationException; import com.google.inject.CreationException;
@@ -339,7 +336,6 @@ public class BaseInit extends SiteProgram {
public final SitePaths site; public final SitePaths site;
public final InitFlags flags; public final InitFlags flags;
final NoteDbSchemaUpdater noteDbSchemaUpdater; final NoteDbSchemaUpdater noteDbSchemaUpdater;
final SchemaFactory<ReviewDb> schema;
final GitRepositoryManager repositoryManager; final GitRepositoryManager repositoryManager;
@Inject @Inject
@@ -348,13 +344,11 @@ public class BaseInit extends SiteProgram {
SitePaths site, SitePaths site,
InitFlags flags, InitFlags flags,
NoteDbSchemaUpdater noteDbSchemaUpdater, NoteDbSchemaUpdater noteDbSchemaUpdater,
@ReviewDbFactory SchemaFactory<ReviewDb> schema,
GitRepositoryManager repositoryManager) { GitRepositoryManager repositoryManager) {
this.ui = ui; this.ui = ui;
this.site = site; this.site = site;
this.flags = flags; this.flags = flags;
this.noteDbSchemaUpdater = noteDbSchemaUpdater; this.noteDbSchemaUpdater = noteDbSchemaUpdater;
this.schema = schema;
this.repositoryManager = repositoryManager; this.repositoryManager = repositoryManager;
} }