Add factory for ChangeResource

This will allow us to inject classes that we need for the ETag
computation.

Change-Id: I0411d53c085eb271b2704fc83f6236bf2a26cc5f
Signed-off-by: Edwin Kempin <ekempin@google.com>

gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/AbstractDaemonTest.java

@@ -197,6 +197,9 @@ public abstract class AbstractDaemonTest {
   @Inject
   protected ChangeNoteUtil changeNoteUtil;
 
+  @Inject
+  protected ChangeResource.Factory changeResourceFactory;
+
   protected TestRepository<InMemoryRepository> testRepo;
   protected GerritServer server;
   protected TestAccount admin;
@@ -741,6 +744,6 @@ public abstract class AbstractDaemonTest {
     List<ChangeControl> ctls = changeFinder.find(
         changeId, atrScope.get().getUser());
     assertThat(ctls).hasSize(1);
-    return new ChangeResource(ctls.get(0));
+    return changeResourceFactory.create(ctls.get(0));
   }
 }

gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/change/ChangeIT.java

@@ -1174,6 +1174,6 @@ public class ChangeIT extends AbstractDaemonTest {
     List<ChangeControl> ctls = changeFinder.find(
         r.getChangeId(), atrScope.get().getUser());
     assertThat(ctls).hasSize(1);
-    return new ChangeResource(ctls.get(0));
+    return changeResourceFactory.create(ctls.get(0));
   }
 }

gerrit-pgm/src/main/java/com/google/gerrit/pgm/RebuildNoteDb.java

@@ -28,6 +28,7 @@ import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.ListeningExecutorService;
 import com.google.common.util.concurrent.MoreExecutors;
+import com.google.gerrit.extensions.config.FactoryModule;
 import com.google.gerrit.extensions.events.GitReferenceUpdatedListener;
 import com.google.gerrit.extensions.registration.DynamicSet;
 import com.google.gerrit.lifecycle.LifecycleManager;
@@ -38,6 +39,7 @@ import com.google.gerrit.reviewdb.client.Change;
 import com.google.gerrit.reviewdb.client.Project;
 import com.google.gerrit.reviewdb.client.RefNames;
 import com.google.gerrit.reviewdb.server.ReviewDb;
+import com.google.gerrit.server.change.ChangeResource;
 import com.google.gerrit.server.config.AllUsersName;
 import com.google.gerrit.server.config.GerritServerConfig;
 import com.google.gerrit.server.git.GitRepositoryManager;
@@ -50,7 +52,6 @@ import com.google.gerrit.server.notedb.NotesMigration;
 import com.google.gerrit.server.schema.DisabledChangesReviewDbWrapper;
 import com.google.gwtorm.server.OrmException;
 import com.google.gwtorm.server.SchemaFactory;
-import com.google.inject.AbstractModule;
 import com.google.inject.Inject;
 import com.google.inject.Injector;
 
@@ -206,7 +207,7 @@ public class RebuildNoteDb extends SiteProgram {
   }
 
   private Injector createSysInjector() {
-    return dbInjector.createChildInjector(new AbstractModule() {
+    return dbInjector.createChildInjector(new FactoryModule() {
       @Override
       public void configure() {
         install(dbInjector.getInstance(BatchProgramModule.class));
@@ -214,6 +215,7 @@ public class RebuildNoteDb extends SiteProgram {
         DynamicSet.bind(binder(), GitReferenceUpdatedListener.class).to(
             ReindexAfterUpdate.class);
         install(new DummyIndexModule());
+        factory(ChangeResource.Factory.class);
       }
     });
   }

gerrit-pgm/src/main/java/com/google/gerrit/pgm/Reindex.java

@@ -18,11 +18,13 @@ import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.gerrit.server.schema.DataSourceProvider.Context.MULTI_USER;
 
 import com.google.gerrit.common.Die;
+import com.google.gerrit.extensions.config.FactoryModule;
 import com.google.gerrit.lifecycle.LifecycleManager;
 import com.google.gerrit.lucene.LuceneIndexModule;
 import com.google.gerrit.pgm.util.BatchProgramModule;
 import com.google.gerrit.pgm.util.SiteProgram;
 import com.google.gerrit.pgm.util.ThreadLimiter;
+import com.google.gerrit.server.change.ChangeResource;
 import com.google.gerrit.server.config.GerritServerConfig;
 import com.google.gerrit.server.git.ScanningChangeCacheImpl;
 import com.google.gerrit.server.index.Index;
@@ -129,6 +131,12 @@ public class Reindex extends SiteProgram {
     // will have just deleted the old (possibly corrupt) index.
     modules.add(ScanningChangeCacheImpl.module());
     modules.add(dbInjector.getInstance(BatchProgramModule.class));
+    modules.add(new FactoryModule() {
+      @Override
+      protected void configure() {
+        factory(ChangeResource.Factory.class);
+      }
+    });
 
     return dbInjector.createChildInjector(modules);
   }

gerrit-server/src/main/java/com/google/gerrit/server/change/ActionJson.java

@@ -35,13 +35,16 @@ import java.util.Map;
 @Singleton
 public class ActionJson {
   private final Revisions revisions;
+  private final ChangeResource.Factory changeResourceFactory;
   private final DynamicMap<RestView<ChangeResource>> changeViews;
 
   @Inject
   ActionJson(
       Revisions revisions,
+      ChangeResource.Factory changeResourceFactory,
       DynamicMap<RestView<ChangeResource>> changeViews) {
     this.revisions = revisions;
+    this.changeResourceFactory = changeResourceFactory;
     this.changeViews = changeViews;
   }
 
@@ -69,7 +72,7 @@ public class ActionJson {
     Provider<CurrentUser> userProvider = Providers.of(ctl.getUser());
     for (UiAction.Description d : UiActions.from(
         changeViews,
-        new ChangeResource(ctl),
+        changeResourceFactory.create(ctl),
         userProvider)) {
       out.put(d.getId(), new ActionInfo(d));
     }

gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeJson.java

@@ -161,6 +161,7 @@ public class ChangeJson {
   private final ActionJson actionJson;
   private final GpgApiAdapter gpgApi;
   private final ChangeNotes.Factory notesFactory;
+  private final ChangeResource.Factory changeResourceFactory;
 
   private AccountLoader accountLoader;
   private Map<Change.Id, List<SubmitRecord>> submitRecords;
@@ -187,6 +188,7 @@ public class ChangeJson {
       ActionJson actionJson,
       GpgApiAdapter gpgApi,
       ChangeNotes.Factory notesFactory,
+      ChangeResource.Factory changeResourceFactory,
       @Assisted Set<ListChangesOption> options) {
     this.db = db;
     this.labelNormalizer = ln;
@@ -207,6 +209,7 @@ public class ChangeJson {
     this.actionJson = actionJson;
     this.gpgApi = gpgApi;
     this.notesFactory = notesFactory;
+    this.changeResourceFactory = changeResourceFactory;
     this.options = options.isEmpty()
         ? EnumSet.noneOf(ListChangesOption.class)
         : EnumSet.copyOf(options);
@@ -956,7 +959,7 @@ public class ChangeJson {
         && userProvider.get().isIdentifiedUser()) {
 
       actionJson.addRevisionActions(out,
-          new RevisionResource(new ChangeResource(ctl), in));
+          new RevisionResource(changeResourceFactory.create(ctl), in));
     }
 
     if (has(PUSH_CERTIFICATES)) {

gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeResource.java

@@ -30,6 +30,8 @@ import com.google.gerrit.server.project.ChangeControl;
 import com.google.gerrit.server.project.ProjectState;
 import com.google.gwtorm.server.OrmException;
 import com.google.inject.TypeLiteral;
+import com.google.inject.assistedinject.Assisted;
+import com.google.inject.assistedinject.AssistedInject;
 
 import org.eclipse.jgit.lib.ObjectId;
 
@@ -45,9 +47,14 @@ public class ChangeResource implements RestResource, HasETag {
   public static final TypeLiteral<RestView<ChangeResource>> CHANGE_KIND =
       new TypeLiteral<RestView<ChangeResource>>() {};
 
+  public interface Factory {
+    ChangeResource create(ChangeControl ctl);
+  }
+
   private final ChangeControl control;
 
-  public ChangeResource(ChangeControl control) {
+  @AssistedInject
+  ChangeResource(@Assisted ChangeControl control) {
     this.control = control;
   }
 

gerrit-server/src/main/java/com/google/gerrit/server/change/ChangesCollection.java

@@ -45,6 +45,7 @@ public class ChangesCollection implements
   private final DynamicMap<RestView<ChangeResource>> views;
   private final ChangeFinder changeFinder;
   private final CreateChange createChange;
+  private final ChangeResource.Factory changeResourceFactory;
 
   @Inject
   ChangesCollection(
@@ -53,13 +54,15 @@ public class ChangesCollection implements
       Provider<QueryChanges> queryFactory,
       DynamicMap<RestView<ChangeResource>> views,
       ChangeFinder changeFinder,
-      CreateChange createChange) {
+      CreateChange createChange,
+      ChangeResource.Factory changeResourceFactory) {
     this.db = db;
     this.user = user;
     this.queryFactory = queryFactory;
     this.views = views;
     this.changeFinder = changeFinder;
     this.createChange = createChange;
+    this.changeResourceFactory = changeResourceFactory;
   }
 
   @Override
@@ -86,7 +89,7 @@ public class ChangesCollection implements
     if (!ctl.isVisible(db.get())) {
       throw new ResourceNotFoundException(id);
     }
-    return new ChangeResource(ctl);
+    return changeResourceFactory.create(ctl);
   }
 
   public ChangeResource parse(Change.Id id)
@@ -102,7 +105,7 @@ public class ChangesCollection implements
     if (!ctl.isVisible(db.get())) {
       throw new ResourceNotFoundException(toIdString(id));
     }
-    return new ChangeResource(ctl);
+    return changeResourceFactory.create(ctl);
   }
 
   private static IdString toIdString(Change.Id id) {
@@ -110,7 +113,7 @@ public class ChangesCollection implements
   }
 
   public ChangeResource parse(ChangeControl control) {
-    return new ChangeResource(control);
+    return changeResourceFactory.create(control);
   }
 
   @SuppressWarnings("unchecked")

gerrit-server/src/main/java/com/google/gerrit/server/change/GetRevisionActions.java

@@ -42,16 +42,19 @@ public class GetRevisionActions implements ETagView<RevisionResource> {
   private final Config config;
   private final Provider<ReviewDb> dbProvider;
   private final MergeSuperSet mergeSuperSet;
+  private final ChangeResource.Factory changeResourceFactory;
 
   @Inject
   GetRevisionActions(
       ActionJson delegate,
       Provider<ReviewDb> dbProvider,
       MergeSuperSet mergeSuperSet,
+      ChangeResource.Factory changeResourceFactory,
       @GerritServerConfig Config config) {
     this.delegate = delegate;
     this.dbProvider = dbProvider;
     this.mergeSuperSet = mergeSuperSet;
+    this.changeResourceFactory = changeResourceFactory;
     this.config = config;
   }
 
@@ -71,7 +74,7 @@ public class GetRevisionActions implements ETagView<RevisionResource> {
       ChangeSet cs =
           mergeSuperSet.completeChangeSet(db, rsrc.getChange(), user);
       for (ChangeData cd : cs.changes()) {
-        new ChangeResource(cd.changeControl()).prepareETag(h, user);
+        changeResourceFactory.create(cd.changeControl()).prepareETag(h, user);
       }
     } catch (IOException | OrmException e) {
       throw new OrmRuntimeException(e);

gerrit-server/src/main/java/com/google/gerrit/server/change/Module.java

@@ -136,5 +136,6 @@ public class Module extends RestApiModule {
     factory(RebaseChangeOp.Factory.class);
     factory(ReviewerResource.Factory.class);
     factory(SetHashtagsOp.Factory.class);
+    factory(ChangeResource.Factory.class);
   }
 }

gerrit-server/src/main/java/com/google/gerrit/server/change/RebaseChangeOp.java

@@ -56,6 +56,7 @@ public class RebaseChangeOp extends BatchUpdate.Op {
   private final PatchSetInserter.Factory patchSetInserterFactory;
   private final MergeUtil.Factory mergeUtilFactory;
   private final RebaseUtil rebaseUtil;
+  private final ChangeResource.Factory changeResourceFactory;
 
   private final ChangeControl ctl;
   private final PatchSet originalPatchSet;
@@ -77,12 +78,14 @@ public class RebaseChangeOp extends BatchUpdate.Op {
       PatchSetInserter.Factory patchSetInserterFactory,
       MergeUtil.Factory mergeUtilFactory,
       RebaseUtil rebaseUtil,
+      ChangeResource.Factory changeResourceFactory,
       @Assisted ChangeControl ctl,
       @Assisted PatchSet originalPatchSet,
       @Assisted @Nullable String baseCommitish) {
     this.patchSetInserterFactory = patchSetInserterFactory;
     this.mergeUtilFactory = mergeUtilFactory;
     this.rebaseUtil = rebaseUtil;
+    this.changeResourceFactory = changeResourceFactory;
     this.ctl = ctl;
     this.originalPatchSet = originalPatchSet;
     this.baseCommitish = baseCommitish;
@@ -138,7 +141,8 @@ public class RebaseChangeOp extends BatchUpdate.Op {
     RevId baseRevId = new RevId((baseCommitish != null) ? baseCommitish
         : ObjectId.toString(baseCommit.getId()));
     Base base = rebaseUtil.parseBase(
-        new RevisionResource(new ChangeResource(ctl), originalPatchSet),
+        new RevisionResource(
+            changeResourceFactory.create(ctl), originalPatchSet),
         baseRevId.get());
 
     rebasedPatchSetId = ChangeUtil.nextPatchSetId(