Merge changes from topic 'abstract-notes-migration'

* changes:
  Use different NotesMigration implementation for testing
  Ensure NotesMigration method calls aren't cached
  Extract an abstract base class for NotesMigration
This commit is contained in:
Dave Borowitz
2016-02-16 15:03:12 +00:00
committed by Gerrit Code Review
18 changed files with 201 additions and 117 deletions

View File

@@ -29,6 +29,7 @@ import com.google.gerrit.server.config.GerritServerConfig;
import com.google.gerrit.server.config.GerritServerConfigModule;
import com.google.gerrit.server.config.SitePath;
import com.google.gerrit.server.git.LocalDiskRepositoryManager;
import com.google.gerrit.server.notedb.ConfigNotesMigration;
import com.google.gerrit.server.schema.DataSourceModule;
import com.google.gerrit.server.schema.DataSourceProvider;
import com.google.gerrit.server.schema.DataSourceType;
@@ -170,6 +171,7 @@ public abstract class SiteProgram extends AbstractProgram {
modules.add(new DatabaseModule());
modules.add(new SchemaModule());
modules.add(new LocalDiskRepositoryManager.Module());
modules.add(new ConfigNotesMigration.Module());
try {
return Guice.createInjector(PRODUCTION, modules);